diff --git a/docs/json/radarr/cf/51-surround.json b/docs/json/radarr/cf/51-surround.json
index bed03cfb5..419038336 100644
--- a/docs/json/radarr/cf/51-surround.json
+++ b/docs/json/radarr/cf/51-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]5[ .][0-1]"
+              "value": "[^0-9]5[ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       }
   ]
diff --git a/docs/json/radarr/cf/61-surround.json b/docs/json/radarr/cf/61-surround.json
index 1b044aa78..04d7b0f5d 100644
--- a/docs/json/radarr/cf/61-surround.json
+++ b/docs/json/radarr/cf/61-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]6[ .][0-1]"
+              "value": "[^0-9]6[ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]5[ .][0-1]"
+              "value": "[^0-9]5[ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/radarr/cf/71-surround.json b/docs/json/radarr/cf/71-surround.json
index f8afac619..18c7292af 100644
--- a/docs/json/radarr/cf/71-surround.json
+++ b/docs/json/radarr/cf/71-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       }
   ]
diff --git a/docs/json/radarr/cf/91-surround.json b/docs/json/radarr/cf/91-surround.json
index 6ab9fd7f8..a01a9e3c1 100644
--- a/docs/json/radarr/cf/91-surround.json
+++ b/docs/json/radarr/cf/91-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-6][ .][0-1]"
+              "value": "[^0-9][5-6][ .][0-1]\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/51-surround.json b/docs/json/sonarr/cf/51-surround.json
index 408676273..7f4331120 100644
--- a/docs/json/sonarr/cf/51-surround.json
+++ b/docs/json/sonarr/cf/51-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]5[ .][0-1]"
+              "value": "[^0-9]5[ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/61-surround.json b/docs/json/sonarr/cf/61-surround.json
index e5223046d..7892a3e8e 100644
--- a/docs/json/sonarr/cf/61-surround.json
+++ b/docs/json/sonarr/cf/61-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]6[ .][0-1]"
+              "value": "[^0-9]6[ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]5[ .][0-1]"
+              "value": "[^0-9]5[ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/71-surround.json b/docs/json/sonarr/cf/71-surround.json
index d79fd8f51..283e9f859 100644
--- a/docs/json/sonarr/cf/71-surround.json
+++ b/docs/json/sonarr/cf/71-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/91-surround.json b/docs/json/sonarr/cf/91-surround.json
index 3485e1fbe..e0755748c 100644
--- a/docs/json/sonarr/cf/91-surround.json
+++ b/docs/json/sonarr/cf/91-surround.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]9[ .][0-1]"
+              "value": "[^0-9]9[ .][0-1]\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
+              "value": "[^0-9][7-8][ .][0-1]\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-6][ .][0-1]"
+              "value": "[^0-9][5-6][ .][0-1]\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+              "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
           }
       }
   ]