diff --git a/VERSION b/VERSION
index 2bb6f156..5a183b77 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.18.0-develop36
+1.18.0-develop37
diff --git a/defaults/both/content_rating_cs.yml b/defaults/both/content_rating_cs.yml
index fc36c802..e66f0fc4 100644
--- a/defaults/both/content_rating_cs.yml
+++ b/defaults/both/content_rating_cs.yml
@@ -92,6 +92,10 @@ dynamic_collections:
         - E
         - gb/E
         - G - All Ages
+        - A
+        - no/A
+        - no/5
+        - no/05
         - "01"
       2:
         - gb/U
@@ -101,6 +105,10 @@ dynamic_collections:
         - E
         - gb/E
         - G - All Ages
+        - A
+        - no/A
+        - no/5
+        - no/05
         - "02"
       3:
         - gb/U
@@ -110,6 +118,10 @@ dynamic_collections:
         - E
         - gb/E
         - G - All Ages
+        - A
+        - no/A
+        - no/5
+        - no/05
         - "03"
       4:
         - gb/U
@@ -119,6 +131,10 @@ dynamic_collections:
         - E
         - gb/E
         - G - All Ages
+        - A
+        - no/A
+        - no/5
+        - no/05
         - "04"
       5:
         - gb/U
@@ -128,6 +144,10 @@ dynamic_collections:
         - E
         - gb/E
         - G - All Ages
+        - A
+        - no/A
+        - no/5
+        - no/05
         - "05"
       6:
         - gb/U
@@ -137,6 +157,10 @@ dynamic_collections:
         - E
         - gb/E
         - G - All Ages
+        - no/6
+        - no/06
+        - no/7
+        - no/07
         - "06"
       7:
         - gb/PG
@@ -145,6 +169,10 @@ dynamic_collections:
         - TV-Y7-FV
         - PG
         - PG - Children
+        - no/6
+        - no/06
+        - no/7
+        - no/07
         - "07"
       8:
         - gb/PG
@@ -153,6 +181,10 @@ dynamic_collections:
         - TV-Y7-FV
         - PG
         - PG - Children
+        - no/6
+        - no/06
+        - no/7
+        - no/07
         - "08"
       9:
         - gb/PG
@@ -162,6 +194,9 @@ dynamic_collections:
         - PG
         - PG - Children
         - gb/9+
+        - no/9
+        - no/09
+        - no/10
         - "09"
       10:
         - gb/PG
@@ -171,6 +206,9 @@ dynamic_collections:
         - PG
         - PG - Children
         - gb/9+
+        - no/9
+        - no/09
+        - no/10
       11:
         - gb/PG
         - TV-PG
@@ -179,18 +217,26 @@ dynamic_collections:
         - PG
         - PG - Children
         - gb/9+
+        - no/9
+        - no/09
+        - no/10
+        - no/11
       12:
         - gb/12
         - gb/12A
         - 12+
         - PG
         - PG - Children
+        - no/11
+        - no/12
       13:
         - gb/12
         - gb/12A
         - 12+
         - PG-13
         - PG-13 - Teens 13 or older
+        - no/11
+        - no/12
       14:
         - gb/12
         - 12
@@ -200,6 +246,8 @@ dynamic_collections:
         - TV-14
         - 13
         - PG-13 - Teens 13 or older
+        - no/11
+        - no/12
       15:
         - gb/15
         - gb/14+
@@ -207,6 +255,8 @@ dynamic_collections:
         - 13
         - 14
         - PG-13 - Teens 13 or older
+        - no/15
+        - no/16
       16:
         - gb/15
         - gb/14+
@@ -215,6 +265,8 @@ dynamic_collections:
         - 14
         - 15
         - PG-13 - Teens 13 or older
+        - no/15
+        - no/16
       17:
         - gb/15
         - gb/14+
@@ -224,6 +276,8 @@ dynamic_collections:
         - 15
         - 16
         - R - 17+ (violence & profanity)
+        - no/15
+        - no/16
       18:
         - gb/18
         - MA-17
@@ -238,4 +292,5 @@ dynamic_collections:
         - NC-17
         - R - 17+ (violence & profanity)
         - R+ - Mild Nudity
-        - Rx - Hentai
\ No newline at end of file
+        - Rx - Hentai
+        - no/18
\ No newline at end of file
diff --git a/defaults/both/content_rating_mal.yml b/defaults/both/content_rating_mal.yml
index 4034e569..ea607baa 100644
--- a/defaults/both/content_rating_mal.yml
+++ b/defaults/both/content_rating_mal.yml
@@ -71,6 +71,8 @@ dynamic_collections:
         - "05"
         - "06"
         - G - All Ages
+        - A
+        - no/A
       PG:
         - TV-Y7
         - TV-Y7-FV
@@ -86,6 +88,12 @@ dynamic_collections:
         - 11
         - 12
         - PG - Children
+        - no/5
+        - no/05
+        - no/6
+        - no/06
+        - no/7
+        - no/07
       PG-13:
         - 13
         - gb/12A
@@ -98,6 +106,11 @@ dynamic_collections:
         - 15
         - 16
         - PG-13 - Teens 13 or older
+        - no/9
+        - no/09
+        - no/10
+        - no/11
+        - no/12
       R:
         - 17
         - 18
@@ -107,6 +120,9 @@ dynamic_collections:
         - R
         - TVMA
         - R - 17+ (violence & profanity)
+        - no/15
+        - no/16
+        - no/18
       R+:
         - R+ - Mild Nudity
       Rx:
diff --git a/defaults/both/content_rating_uk.yml b/defaults/both/content_rating_uk.yml
index d82a96af..3e91619a 100644
--- a/defaults/both/content_rating_uk.yml
+++ b/defaults/both/content_rating_uk.yml
@@ -75,6 +75,8 @@ dynamic_collections:
         - "05"
         - "06"
         - G - All Ages
+        - A
+        - no/A
       PG:
         - gb/PG
         - gb/9+
@@ -91,10 +93,21 @@ dynamic_collections:
         - "08"
         - "09"
         - PG - Children
+        - no/5
+        - no/05
+        - no/6
+        - no/06
+        - no/7
+        - no/07
       12:
         - gb/12
         - 12
         - PG-13 - Teens 13 or older
+        - no/9
+        - no/09
+        - no/10
+        - no/11
+        - no/12
       12A:
         - gb/12A
         - 12+
@@ -102,6 +115,11 @@ dynamic_collections:
         - TV-13
         - 12
         - PG-13 - Teens 13 or older
+        - no/9
+        - no/09
+        - no/10
+        - no/11
+        - no/12
       15:
         - gb/15
         - gb/14+
@@ -110,6 +128,8 @@ dynamic_collections:
         - 14
         - 15
         - PG-13 - Teens 13 or older
+        - no/15
+        - no/16
       18:
         - gb/18
         - MA-17
@@ -121,6 +141,7 @@ dynamic_collections:
         - 18
         - R - 17+ (violence & profanity)
         - R+ - Mild Nudity
+        - no/18
       R18:
         - gb/R18
         - gb/X
diff --git a/defaults/movie/content_rating_us.yml b/defaults/movie/content_rating_us.yml
index eb65d19b..aa6c8132 100644
--- a/defaults/movie/content_rating_us.yml
+++ b/defaults/movie/content_rating_us.yml
@@ -73,6 +73,8 @@ dynamic_collections:
         - "05"
         - "06"
         - G - All Ages
+        - A
+        - no/A
       PG:
         - gb/PG
         - gb/9+
@@ -88,6 +90,12 @@ dynamic_collections:
         - "10"
         - "11"
         - PG - Children
+        - no/5
+        - no/05
+        - no/6
+        - no/06
+        - no/7
+        - no/07
       PG-13:
         - gb/12A
         - gb/12
@@ -102,6 +110,11 @@ dynamic_collections:
         - 15
         - 16
         - PG-13 - Teens 13 or older
+        - no/9
+        - no/09
+        - no/10
+        - no/11
+        - no/12
       R:
         - 17
         - 18
@@ -111,6 +124,9 @@ dynamic_collections:
         - TV-MA
         - R - 17+ (violence & profanity)
         - R+ - Mild Nudity
+        - no/15
+        - no/16
+        - no/18
       NC-17:
         - gb/R18
         - gb/X