diff --git a/packages/config/config/devices/0x0460/qnsw-001P16.json b/packages/config/config/devices/0x0460/qnsw-001P16.json
index 1c5fe9c6e7aa..802b411f3569 100644
--- a/packages/config/config/devices/0x0460/qnsw-001P16.json
+++ b/packages/config/config/devices/0x0460/qnsw-001P16.json
@@ -56,11 +56,15 @@
 		{
 			"#": "17",
 			"$import": "~/templates/master_template.json#state_after_power_failure_prev_off",
-			"label": "O1: State After Power Failure"
+			"label": "O1: State After Power Failure",
+			"minValue": 0,
+			"maxValue": 1,
+			"unsigned": true
 		},
 		{
 			"#": "19",
 			"label": "O1: Auto-Off Timer",
+			"description": "The timer resets to zero each time the Device receives an ON command",
 			"valueSize": 2,
 			"minValue": 0,
 			"maxValue": 32535,
@@ -70,6 +74,7 @@
 		{
 			"#": "20",
 			"label": "O1: Auto-On Timer",
+			"description": "The timer resets to zero each time the Device receives an OFF command",
 			"valueSize": 2,
 			"minValue": 0,
 			"maxValue": 32535,
@@ -77,8 +82,8 @@
 			"unsigned": true
 		},
 		{
-			"#": "25",
-			"label": "O1: Auto-On/Off Timer Unit",
+			"#": "23",
+			"label": "O1: Relay Type",
 			"valueSize": 1,
 			"minValue": 0,
 			"maxValue": 1,
@@ -87,18 +92,18 @@
 			"allowManualEntry": false,
 			"options": [
 				{
-					"label": "Seconds",
+					"label": "NO: normally open",
 					"value": 0
 				},
 				{
-					"label": "10 ms",
+					"label": "NC: normally closed",
 					"value": 1
 				}
 			]
 		},
 		{
-			"#": "23",
-			"label": "O1: Relay Type",
+			"#": "25",
+			"label": "O1: Auto-On/Off Timer Unit",
 			"valueSize": 1,
 			"minValue": 0,
 			"maxValue": 1,
@@ -107,11 +112,11 @@
 			"allowManualEntry": false,
 			"options": [
 				{
-					"label": "Normally open (NO)",
+					"label": "Seconds",
 					"value": 0
 				},
 				{
-					"label": "Normally closed (NC)",
+					"label": "10 ms",
 					"value": 1
 				}
 			]
@@ -139,7 +144,7 @@
 		{
 			"#": "91",
 			"label": "Alarm Configuration: Water",
-			"description": "This parameter determines which alarm frames the Device should respond to and how. The parameters consist of 4 bytes, the three most significant bytes are set according to the official Z-Wave protocol specification.",
+			"description": "This parameter determines which alarm frames the Device should respond to and how.",
 			"valueSize": 4,
 			"defaultValue": 0,
 			"unsigned": true,
@@ -162,7 +167,7 @@
 		{
 			"#": "92",
 			"label": "Alarm Configuration: Smoke",
-			"description": "This parameter determines which alarm frames the Device should respond to and how. The parameters consist of 4 bytes, the three most significant bytes are set according to the official Z-Wave protocol specification.0",
+			"description": "This parameter determines which alarm frames the Device should respond to and how.",
 			"valueSize": 4,
 			"defaultValue": 0,
 			"unsigned": true,
@@ -185,7 +190,7 @@
 		{
 			"#": "93",
 			"label": "Alarm Configuration: CO",
-			"description": "This parameter determines which alarm frames the Device should respond to and how. The parameters consist of 4 bytes, the three most significant bytes are set according to the official Z-Wave protocol specification.",
+			"description": "This parameter determines which alarm frames the Device should respond to and how.",
 			"valueSize": 4,
 			"defaultValue": 0,
 			"unsigned": true,
@@ -208,7 +213,7 @@
 		{
 			"#": "94",
 			"label": "Alarm Configuration: Heat",
-			"description": "This parameter determines which alarm frames the Device should respond to and how. The parameters consist of 4 bytes, the three most significant bytes are set according to the official Z-Wave protocol specification.",
+			"description": "This parameter determines which alarm frames the Device should respond to and how.",
 			"valueSize": 4,
 			"defaultValue": 0,
 			"unsigned": true,
@@ -250,6 +255,7 @@
 		{
 			"#": "201",
 			"label": "Serial Number: Part 1",
+			"description": "This parameter contains a part of devices serial number.",
 			"valueSize": 4,
 			"minValue": 0,
 			"maxValue": 2147483647,
@@ -259,6 +265,7 @@
 		{
 			"#": "202",
 			"label": "Serial Number: Part 2",
+			"description": "This parameter contains a part of devices serial number.",
 			"valueSize": 4,
 			"minValue": 0,
 			"maxValue": 2147483647,
@@ -268,6 +275,7 @@
 		{
 			"#": "203",
 			"label": "Serial Number: Part 3",
+			"description": "This parameter contains a part of devices serial number.",
 			"valueSize": 4,
 			"minValue": 0,
 			"maxValue": 2147483647,