From 6065824d40f757f052db0c45704821207171b766 Mon Sep 17 00:00:00 2001
From: zakary <zak@ary.dev>
Date: Tue, 7 May 2024 12:04:55 -0500
Subject: [PATCH] fix(starr-cf/audio-channels): add word barrier and negates to
 prevent matching incorrectly (#1919)

* fix(cf/audio-channels): add word barrier to prevent matching incorrectly

* update(cf/audio-channels): change to rg recommendations

add word barriers to all low channel and adjust negates

remove 9.1 from guides
---
 .../Radarr-collection-of-custom-formats.md    | 14 +---
 .../sonarr-collection-of-custom-formats.md    | 14 +---
 docs/json/radarr/cf/10-mono.json              | 17 +---
 docs/json/radarr/cf/20-stereo.json            | 10 +--
 docs/json/radarr/cf/30-sound.json             | 10 +--
 docs/json/radarr/cf/40-sound.json             | 10 +--
 docs/json/radarr/cf/51-surround.json          | 71 ++++++++--------
 docs/json/radarr/cf/61-surround.json          | 80 +++++++++----------
 docs/json/radarr/cf/71-surround.json          | 62 ++++++++------
 docs/json/radarr/cf/91-surround.json          | 42 ----------
 docs/json/sonarr/cf/10-mono.json              | 17 +---
 docs/json/sonarr/cf/20-stereo.json            | 10 +--
 docs/json/sonarr/cf/30-sound.json             |  8 +-
 docs/json/sonarr/cf/40-sound.json             | 10 +--
 docs/json/sonarr/cf/51-surround.json          | 62 +++++++-------
 docs/json/sonarr/cf/61-surround.json          | 80 +++++++++----------
 docs/json/sonarr/cf/71-surround.json          | 62 ++++++++------
 docs/json/sonarr/cf/91-surround.json          | 42 ----------
 18 files changed, 246 insertions(+), 375 deletions(-)
 delete mode 100644 docs/json/radarr/cf/91-surround.json
 delete mode 100644 docs/json/sonarr/cf/91-surround.json

diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md
index 11e490176..2e97b9b1d 100644
--- a/docs/Radarr/Radarr-collection-of-custom-formats.md
+++ b/docs/Radarr/Radarr-collection-of-custom-formats.md
@@ -42,7 +42,7 @@ We've made 3 guides related to this.
 | [TrueHD](#truehd)                     | [DD](#dd)                 | [5.1 Surround](#51-surround) | [DV SDR](#dv-sdr)                 |
 | [DTS-HD MA](#dts-hd-ma)               | [MP3](#mp3)               | [6.1 Surround](#61-surround) | [HDR10+](#hdr10plus)              |
 | [DD+](#ddplus)                        | [Opus](#opus)             | [7.1 Surround](#71-surround) | [HDR10](#hdr10)                   |
-| [DTS-ES](#dts-es)                     |                           | [9.1 Surround](#91-surround) | [HDR](#hdr)                       |
+| [DTS-ES](#dts-es)                     |                           |                              | [HDR](#hdr)                       |
 | [DTS](#dts)                           |                           |                              | [HDR (undefined)](#hdr-undefined) |
 |                                       |                           |                              | [PQ](#pq)                         |
 |                                       |                           |                              | [HLG](#hlg)                       |
@@ -479,18 +479,6 @@ We've made 3 guides related to this.
 
 ---
 
-### 9.1 Surround
-
-??? example "JSON - [Click to show/hide]"
-
-    ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/91-surround.json' %]][[% endfilter %]]
-    ```
-
-<sub><sup>[TOP](#index)</sup>
-
----
-
 ## HDR Formats
 
 ---
diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md
index eebf52472..a46705c69 100644
--- a/docs/Sonarr/sonarr-collection-of-custom-formats.md
+++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md
@@ -39,7 +39,7 @@ We've made 3 guides related to this.
 | [TrueHD](#truehd)                     | [DD](#dd)                 | [5.1 Surround](#51-surround) | [DV SDR](#dv-sdr)                 |
 | [DTS-HD MA](#dts-hd-ma)               | [MP3](#mp3)               | [6.1 Surround](#61-surround) | [HDR10+](#hdr10plus)              |
 | [DD+](#ddplus)                        | [Opus](#opus)             | [7.1 Surround](#71-surround) | [HDR10](#hdr10)                   |
-| [DTS-ES](#dts-es)                     |                           | [9.1 Surround](#91-surround) | [HDR](#hdr)                       |
+| [DTS-ES](#dts-es)                     |                           |                              | [HDR](#hdr)                       |
 | [DTS](#dts)                           |                           |                              | [HDR (undefined)](#hdr-undefined) |
 |                                       |                           |                              | [PQ](#pq)                         |
 |                                       |                           |                              | [HLG](#hlg)                       |
@@ -480,18 +480,6 @@ We've made 3 guides related to this.
 
 ---
 
-### 9.1 Surround
-
-??? example "JSON - [Click to show/hide]"
-
-    ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/91-surround.json' %]][[% endfilter %]]
-    ```
-
-<sub><sup>[TOP](#index)</sup>
-
----
-
 ## HDR Formats
 
 ---
diff --git a/docs/json/radarr/cf/10-mono.json b/docs/json/radarr/cf/10-mono.json
index 4b56ad0fc..2ceb864ce 100644
--- a/docs/json/radarr/cf/10-mono.json
+++ b/docs/json/radarr/cf/10-mono.json
@@ -8,16 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]1[ .]0|\\bMono\\b|\\[PCM \\]"
-          }
-      },
-      {
-          "name": "Not Stereo",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]"
           }
       },
       {
@@ -26,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -35,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -44,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/radarr/cf/20-stereo.json b/docs/json/radarr/cf/20-stereo.json
index 788cecd76..6d39612cd 100644
--- a/docs/json/radarr/cf/20-stereo.json
+++ b/docs/json/radarr/cf/20-stereo.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "(?<!repac)[^0-9]2[ .]0\\b|\\bStereo\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]1[ .]0|\\bMono\\b|\\[PCM \\]"
+              "value": "[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]"
           }
       }
   ]
diff --git a/docs/json/radarr/cf/30-sound.json b/docs/json/radarr/cf/30-sound.json
index 2b4beb2ba..265481f76 100644
--- a/docs/json/radarr/cf/30-sound.json
+++ b/docs/json/radarr/cf/30-sound.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]1[ .]0|\\bMono\\b|\\[PCM \\]"
+              "value": "[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "(?<!repac)[^0-9]2[ .]0\\b|\\bStereo\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/radarr/cf/40-sound.json b/docs/json/radarr/cf/40-sound.json
index 6b51f70a3..d19a583c1 100644
--- a/docs/json/radarr/cf/40-sound.json
+++ b/docs/json/radarr/cf/40-sound.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]1[ .]0|\\bMono\\b|\\[PCM \\]"
+              "value": "[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "(?<!repac)[^0-9]2[ .]0\\b|\\bStereo\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/radarr/cf/51-surround.json b/docs/json/radarr/cf/51-surround.json
index bed03cfb5..9d670b86c 100644
--- a/docs/json/radarr/cf/51-surround.json
+++ b/docs/json/radarr/cf/51-surround.json
@@ -2,41 +2,42 @@
   "trash_id": "77ff61788dfe1097194fd8743d7b4524",
   "name": "5.1 Surround",
   "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "5.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]5[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 9.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
+  "specifications": [
+    {
+      "name": "5.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]5[ .][0-1]\\b"
       }
+    },
+    {
+      "name": "6.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]6[ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not 7.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9][7-8][ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not Low Channel Count",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "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..87acd1f59 100644
--- a/docs/json/radarr/cf/61-surround.json
+++ b/docs/json/radarr/cf/61-surround.json
@@ -2,50 +2,42 @@
   "trash_id": "6fd7b090c3f7317502ab3b63cc7f51e3",
   "name": "6.1 Surround",
   "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "6.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]6[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 9.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
-      },
-      {
-          "name": "Not 5.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]5[ .][0-1]"
-          }
+  "specifications": [
+    {
+      "name": "6.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]6[ .][0-1]\\b"
       }
+    },
+    {
+      "name": "Not 7.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9][7-8][ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not 5.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]5[ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not Low Channel Count",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "(?<!repac)[^0-9][1-4][ .][0-1]\\b|\\b(Stereo|Mono)\\b"
+      }
+    }
   ]
 }
diff --git a/docs/json/radarr/cf/71-surround.json b/docs/json/radarr/cf/71-surround.json
index f8afac619..01d67fea0 100644
--- a/docs/json/radarr/cf/71-surround.json
+++ b/docs/json/radarr/cf/71-surround.json
@@ -2,32 +2,42 @@
   "trash_id": "e77382bcfeba57cb83744c9c5449b401",
   "name": "7.1 Surround",
   "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 9.1  Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
+  "specifications": [
+    {
+      "name": "7.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "[^0-9][7-8][ .][0-1]\\b"
       }
+    },
+    {
+      "name": "5.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]5[ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "6.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]6[ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not Low Channel Count",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+      }
+    }
   ]
 }
diff --git a/docs/json/radarr/cf/91-surround.json b/docs/json/radarr/cf/91-surround.json
deleted file mode 100644
index 6ab9fd7f8..000000000
--- a/docs/json/radarr/cf/91-surround.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "trash_id": "f2aacebe2c932337fe352fa6e42c1611",
-  "name": "9.1 Surround",
-  "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "9.1  Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 5.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][5-6][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
-      }
-  ]
-}
diff --git a/docs/json/sonarr/cf/10-mono.json b/docs/json/sonarr/cf/10-mono.json
index f75df27ab..89450f209 100644
--- a/docs/json/sonarr/cf/10-mono.json
+++ b/docs/json/sonarr/cf/10-mono.json
@@ -8,16 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]1[ .]0|\\bMono\\b|\\[PCM \\]"
-          }
-      },
-      {
-          "name": "Not Stereo",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]"
           }
       },
       {
@@ -26,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -35,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -44,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/20-stereo.json b/docs/json/sonarr/cf/20-stereo.json
index d000d6e0a..28d306686 100644
--- a/docs/json/sonarr/cf/20-stereo.json
+++ b/docs/json/sonarr/cf/20-stereo.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "(?<!repac)[^0-9]2[ .]0\\b|\\bStereo\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]1[ .]0|\\bMono\\b|\\[PCM \\]"
+              "value": "[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/30-sound.json b/docs/json/sonarr/cf/30-sound.json
index 1c4fcf778..11c81f252 100644
--- a/docs/json/sonarr/cf/30-sound.json
+++ b/docs/json/sonarr/cf/30-sound.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "(?<!repac)[^0-9]2[ .]0\\b|\\bStereo\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/40-sound.json b/docs/json/sonarr/cf/40-sound.json
index 99ce27f27..7568bf4d3 100644
--- a/docs/json/sonarr/cf/40-sound.json
+++ b/docs/json/sonarr/cf/40-sound.json
@@ -8,7 +8,7 @@
           "negate": false,
           "required": true,
           "fields": {
-              "value": "[^0-9]4[ .]0"
+              "value": "[^0-9]4[ .]0\\b"
           }
       },
       {
@@ -17,7 +17,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]1[ .]0|\\bMono\\b|\\[PCM \\]"
+              "value": "[^0-9]1[ .]0\\b|\\bMono\\b|\\[PCM \\]"
           }
       },
       {
@@ -26,7 +26,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "(?<!repac)[^0-9]2[ .]0|\\bStereo\\b"
+              "value": "(?<!repac)[^0-9]2[ .]0\\b|\\bStereo\\b"
           }
       },
       {
@@ -35,7 +35,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9]3[ .]0"
+              "value": "[^0-9]3[ .]0\\b"
           }
       },
       {
@@ -44,7 +44,7 @@
           "negate": true,
           "required": true,
           "fields": {
-              "value": "[^0-9][5-9][ .][0-1]"
+              "value": "[^0-9][5-9][ .][0-1]\\b"
           }
       }
   ]
diff --git a/docs/json/sonarr/cf/51-surround.json b/docs/json/sonarr/cf/51-surround.json
index 408676273..c1b853dc9 100644
--- a/docs/json/sonarr/cf/51-surround.json
+++ b/docs/json/sonarr/cf/51-surround.json
@@ -2,41 +2,33 @@
   "trash_id": "3fbafa924f361e66fbc6187af82dfa85",
   "name": "5.1 Surround",
   "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "5.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]5[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 9.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
+  "specifications": [
+    {
+      "name": "5.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]5[ .][0-1]\\b"
       }
+    },
+    {
+      "name": "Not 7.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9][7-8][ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not Low Channel Count",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+      }
+    }
   ]
 }
diff --git a/docs/json/sonarr/cf/61-surround.json b/docs/json/sonarr/cf/61-surround.json
index e5223046d..405882787 100644
--- a/docs/json/sonarr/cf/61-surround.json
+++ b/docs/json/sonarr/cf/61-surround.json
@@ -2,50 +2,42 @@
   "trash_id": "9fb6d778592c293467437593ef394bf1",
   "name": "6.1 Surround",
   "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "6.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]6[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 9.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
-      },
-      {
-          "name": "Not 5.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]5[ .][0-1]"
-          }
+  "specifications": [
+    {
+      "name": "6.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]6[ .][0-1]\\b"
       }
+    },
+    {
+      "name": "Not 7.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9][7-8][ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not 5.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]5[ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not Low Channel Count",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+      }
+    }
   ]
 }
diff --git a/docs/json/sonarr/cf/71-surround.json b/docs/json/sonarr/cf/71-surround.json
index d79fd8f51..3f1cc044c 100644
--- a/docs/json/sonarr/cf/71-surround.json
+++ b/docs/json/sonarr/cf/71-surround.json
@@ -2,32 +2,42 @@
   "trash_id": "204c8c3e7315bb0ea81332774fa888d6",
   "name": "7.1 Surround",
   "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 9.1  Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
+  "specifications": [
+    {
+      "name": "7.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": true,
+      "fields": {
+        "value": "[^0-9][7-8][ .][0-1]\\b"
       }
+    },
+    {
+      "name": "5.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]5[ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "6.1 Surround",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "[^0-9]6[ .][0-1]\\b"
+      }
+    },
+    {
+      "name": "Not Low Channel Count",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
+      }
+    }
   ]
 }
diff --git a/docs/json/sonarr/cf/91-surround.json b/docs/json/sonarr/cf/91-surround.json
deleted file mode 100644
index 3485e1fbe..000000000
--- a/docs/json/sonarr/cf/91-surround.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "trash_id": "a377864de6228b252d6e28962673cedd",
-  "name": "9.1 Surround",
-  "includeCustomFormatWhenRenaming": false,
-  "specifications": [{
-          "name": "9.1  Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": false,
-          "required": true,
-          "fields": {
-              "value": "[^0-9]9[ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 7.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][7-8][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not 5.1 Surround",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "[^0-9][5-6][ .][0-1]"
-          }
-      },
-      {
-          "name": "Not Low Channel Count",
-          "implementation": "ReleaseTitleSpecification",
-          "negate": true,
-          "required": true,
-          "fields": {
-              "value": "(?<!repac)[^0-9][1-4][ .][0-1]|\\b(Stereo|Mono)\\b"
-          }
-      }
-  ]
-}