diff --git a/src/Jackett.Common/Definitions/1337x.yml b/src/Jackett.Common/Definitions/1337x.yml
index 77b91341a..cc0b764d9 100644
--- a/src/Jackett.Common/Definitions/1337x.yml
+++ b/src/Jackett.Common/Definitions/1337x.yml
@@ -130,7 +130,7 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, album, artist]
     book-search: [q]
 
 settings:
diff --git a/src/Jackett.Common/Definitions/btetree.yml b/src/Jackett.Common/Definitions/btetree.yml
index 9487efd40..8fa13035d 100644
--- a/src/Jackett.Common/Definitions/btetree.yml
+++ b/src/Jackett.Common/Definitions/btetree.yml
@@ -16,7 +16,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 settings:
   - name: sort
diff --git a/src/Jackett.Common/Definitions/efectodoppler.yml b/src/Jackett.Common/Definitions/efectodoppler.yml
index 0ce3ed3c2..c6b7c899c 100644
--- a/src/Jackett.Common/Definitions/efectodoppler.yml
+++ b/src/Jackett.Common/Definitions/efectodoppler.yml
@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, album, artist]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/fullmixmusic.yml b/src/Jackett.Common/Definitions/fullmixmusic.yml
index 43d7d75b9..46f54fda0 100644
--- a/src/Jackett.Common/Definitions/fullmixmusic.yml
+++ b/src/Jackett.Common/Definitions/fullmixmusic.yml
@@ -16,7 +16,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 login:
   path: login.php
diff --git a/src/Jackett.Common/Definitions/funkytorrents.yml b/src/Jackett.Common/Definitions/funkytorrents.yml
index 3780eb7ea..0770a3104 100644
--- a/src/Jackett.Common/Definitions/funkytorrents.yml
+++ b/src/Jackett.Common/Definitions/funkytorrents.yml
@@ -54,7 +54,7 @@ caps:
   modes:
     search: [q]
     movie-search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
     book-search: [q]
 
 login:
@@ -93,8 +93,8 @@ search:
     category:
       optional: true
       case:
-        a[href="/browse.php?ext=1&bitrate=Lossless"]: "3040"
-        a[href="/browse.php?ext=1&format=MP3"]: "3010"
+        a[href="/browse.php?ext=1&bitrate=Lossless"]: 3040
+        a[href="/browse.php?ext=1&format=MP3"]: 3010
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -113,15 +113,14 @@ search:
       selector: td:nth-child(7)
       filters:
         - name: append
-          args: " +0000"
+          args: " +00:00" # GMT
         - name: dateparse
-          args: "2006-01-0215:04:05 -0700"
+          args: "2006-01-0215:04:05 -07:00"
     grabs:
       selector: td:nth-child(9)
     downloadvolumefactor:
       case:
-        img[alt="Free Leech"]: "0"
-        "*": "1"
+        img[alt="Free Leech"]: 0
+        "*": 1
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
diff --git a/src/Jackett.Common/Definitions/jpopsuki.yml b/src/Jackett.Common/Definitions/jpopsuki.yml
index 2230b17ca..124404385 100644
--- a/src/Jackett.Common/Definitions/jpopsuki.yml
+++ b/src/Jackett.Common/Definitions/jpopsuki.yml
@@ -25,7 +25,7 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 login:
   path: login.php
diff --git a/src/Jackett.Common/Definitions/losslessclub.yml b/src/Jackett.Common/Definitions/losslessclub.yml
index 92eb6da7c..53af29585 100644
--- a/src/Jackett.Common/Definitions/losslessclub.yml
+++ b/src/Jackett.Common/Definitions/losslessclub.yml
@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 login:
   path: takelogin.php
diff --git a/src/Jackett.Common/Definitions/metaltracker.yml b/src/Jackett.Common/Definitions/metaltracker.yml
index 994afa46d..c00fcb6da 100644
--- a/src/Jackett.Common/Definitions/metaltracker.yml
+++ b/src/Jackett.Common/Definitions/metaltracker.yml
@@ -18,7 +18,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, album, artist]
     book-search: [q]
 
 settings:
diff --git a/src/Jackett.Common/Definitions/muziekfabriek.yml b/src/Jackett.Common/Definitions/muziekfabriek.yml
index dc34ebd88..f59d92750 100644
--- a/src/Jackett.Common/Definitions/muziekfabriek.yml
+++ b/src/Jackett.Common/Definitions/muziekfabriek.yml
@@ -37,7 +37,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 login:
   path: takelogin.php
diff --git a/src/Jackett.Common/Definitions/netlab.yml b/src/Jackett.Common/Definitions/netlab.yml
index 8df3d581a..90fb34bcf 100644
--- a/src/Jackett.Common/Definitions/netlab.yml
+++ b/src/Jackett.Common/Definitions/netlab.yml
@@ -26,7 +26,7 @@ caps:
     search: [q]
     tv-search: [q]
     movie-search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
     book-search: [q]
 
 settings:
diff --git a/src/Jackett.Common/Definitions/puurhollands.yml b/src/Jackett.Common/Definitions/puurhollands.yml
index 27b2f9c58..105d2117e 100644
--- a/src/Jackett.Common/Definitions/puurhollands.yml
+++ b/src/Jackett.Common/Definitions/puurhollands.yml
@@ -20,7 +20,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 settings:
   - name: cookie
diff --git a/src/Jackett.Common/Definitions/rockbox.yml b/src/Jackett.Common/Definitions/rockbox.yml
index 2c4adeb4b..5e987eb8c 100644
--- a/src/Jackett.Common/Definitions/rockbox.yml
+++ b/src/Jackett.Common/Definitions/rockbox.yml
@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, album, artist]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/romanianmetaltorrents.yml b/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
index b20f26c60..2272ccc5d 100644
--- a/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
+++ b/src/Jackett.Common/Definitions/romanianmetaltorrents.yml
@@ -16,7 +16,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 login:
   path: login.php
diff --git a/src/Jackett.Common/Definitions/shellife.yml b/src/Jackett.Common/Definitions/shellife.yml
index d8b4942c7..e1285da6e 100644
--- a/src/Jackett.Common/Definitions/shellife.yml
+++ b/src/Jackett.Common/Definitions/shellife.yml
@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 login:
   path: takelogin.php
diff --git a/src/Jackett.Common/Definitions/trancetraffic.yml b/src/Jackett.Common/Definitions/trancetraffic.yml
index d7ba1f8a0..7e901b62f 100644
--- a/src/Jackett.Common/Definitions/trancetraffic.yml
+++ b/src/Jackett.Common/Definitions/trancetraffic.yml
@@ -14,7 +14,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 login:
   path: takelogin.php
diff --git a/src/Jackett.Common/Definitions/tribalmixes.yml b/src/Jackett.Common/Definitions/tribalmixes.yml
index 5f35a6db3..a2c238be1 100644
--- a/src/Jackett.Common/Definitions/tribalmixes.yml
+++ b/src/Jackett.Common/Definitions/tribalmixes.yml
@@ -35,7 +35,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 settings:
   - name: username
diff --git a/src/Jackett.Common/Definitions/twilightszoom.yml b/src/Jackett.Common/Definitions/twilightszoom.yml
index e0620ed17..075c5be16 100644
--- a/src/Jackett.Common/Definitions/twilightszoom.yml
+++ b/src/Jackett.Common/Definitions/twilightszoom.yml
@@ -80,7 +80,7 @@ caps:
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, album, artist]
 
 settings:
   - name: username