diff --git a/plugins/modbus/modbus-tcp.json b/plugins/modbus/modbus-tcp.json
index 1076ebbd..15385526 100644
--- a/plugins/modbus/modbus-tcp.json
+++ b/plugins/modbus/modbus-tcp.json
@@ -1,36 +1,28 @@
 {
-	"tag_type": [
-		3,
-		4,
-		5,
-		6,
-		9,
-		11
-	],
 	"tag_regex": [
 		{
 			"type": 3,
-			"regex": "[1-9]+![3-4][0]*[0-9]*([1-9]#B|[1-9]#L|[1-9])$"
+			"regex": "[1-9]+![3-4][0-9]+(#B|#L|)$"
 		},
 		{
 			"type": 4,
-			"regex": "[1-9]+![3-4][0]*[0-9]*([1-9]#B|[1-9]#L|[1-9])$"
+			"regex": "[1-9]+![3-4][0-9]+(#B|#L|)$"
 		},
 		{
 			"type": 5,
-			"regex": "[1-9]+![3-4][0]*[0-9]*([1-9]#BB|[1-9]#BL|[1-9]#LL|[1-9]#LB|[1-9])$"
+			"regex": "[1-9]+![3-4][0-9]+(#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 6,
-			"regex": "[1-9]+![3-4][0]*[0-9]*([1-9]#BB|[1-9]#BL|[1-9]#LL|[1-9]#LB|[1-9])$"
+			"regex": "[1-9]+![3-4][0-9]+(#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 9,
-			"regex": "[1-9]+![3-4][0]*[0-9]*([1-9]#BB|[1-9]#BL|[1-9]#LL|[1-9]#LB|[1-9])$"
+			"regex": "[1-9]+![3-4][0-9]+(#BB|#BL|#LL|#LB|)$"
 		},
 		{
 			"type": 11,
-			"regex": "[1-9]+!([0-1][0]*[0-9]*[1-9]|[3-4][0]*[0-9]*[1-9].([0-9]|[0-1][0-5])$)"
+			"regex": "[1-9]+!([0-1][0-9]+|[3-4][0-9]+.([0-9]|[0-1][0-5]))$"
 		}
 	],
 	"host": {