diff --git a/src/Jackett.Common/Definitions/DasUnerwartete.yml b/src/Jackett.Common/Definitions/DasUnerwartete.yml
index be6657ac5..f583a0a69 100644
--- a/src/Jackett.Common/Definitions/DasUnerwartete.yml
+++ b/src/Jackett.Common/Definitions/DasUnerwartete.yml
@@ -78,11 +78,12 @@ search:
   path: browse.php
   inputs:
     $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: "1"
+    search: "{{ .Keywords }}"
+    incldead: "
 
   rows:
     selector: table.tableinborder > tbody > tr:has(a[href^="download.php"])
+
   fields:
     title:
       selector: a[href^="details.php"]
@@ -121,5 +122,5 @@ search:
         img[src="pic/oupic.gif"]: "0"
         "*": "1"
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
diff --git a/src/Jackett.Common/Definitions/dariustracker.yml b/src/Jackett.Common/Definitions/dariustracker.yml
index c7d12acc5..ca0c3ec26 100644
--- a/src/Jackett.Common/Definitions/dariustracker.yml
+++ b/src/Jackett.Common/Definitions/dariustracker.yml
@@ -70,19 +70,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "1": "name"
-      "5": "size"
-      "4": "added"
-      "7": "seeders"
+      1: name
+      5: size
+      4: added
+      7: seeders
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
diff --git a/src/Jackett.Common/Definitions/dark-shadow.yml b/src/Jackett.Common/Definitions/dark-shadow.yml
index b1457db64..2be96bcf8 100644
--- a/src/Jackett.Common/Definitions/dark-shadow.yml
+++ b/src/Jackett.Common/Definitions/dark-shadow.yml
@@ -90,19 +90,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeds": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeds: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
diff --git a/src/Jackett.Common/Definitions/darktracker.yml b/src/Jackett.Common/Definitions/darktracker.yml
index 83fae9c8f..ec5c26052 100644
--- a/src/Jackett.Common/Definitions/darktracker.yml
+++ b/src/Jackett.Common/Definitions/darktracker.yml
@@ -627,19 +627,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 login:
   path: login.php
diff --git a/src/Jackett.Common/Definitions/datascene.yml b/src/Jackett.Common/Definitions/datascene.yml
index 5b056b4f0..7da2cfb63 100644
--- a/src/Jackett.Common/Definitions/datascene.yml
+++ b/src/Jackett.Common/Definitions/datascene.yml
@@ -74,19 +74,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php
diff --git a/src/Jackett.Common/Definitions/deildu.yml b/src/Jackett.Common/Definitions/deildu.yml
index 83dce8c64..31d1e6c5d 100644
--- a/src/Jackett.Common/Definitions/deildu.yml
+++ b/src/Jackett.Common/Definitions/deildu.yml
@@ -41,19 +41,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php
diff --git a/src/Jackett.Common/Definitions/demonoid.yml b/src/Jackett.Common/Definitions/demonoid.yml
index 0a119049d..a0f6570f8 100644
--- a/src/Jackett.Common/Definitions/demonoid.yml
+++ b/src/Jackett.Common/Definitions/demonoid.yml
@@ -294,13 +294,13 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: _
     options:
-      "_": "created"
-      "S": "seeders desc"
-      "s": "seeders asc"
-      "B": "size desc"
-      "b": "size asc"
+      _: created
+      S: seeders desc
+      s: seeders asc
+      B: size desc
+      b: size asc
 
 login:
   method: cookie
diff --git a/src/Jackett.Common/Definitions/desireleasers.yml b/src/Jackett.Common/Definitions/desireleasers.yml
index 2b2bc80db..6c4058bdb 100644
--- a/src/Jackett.Common/Definitions/desireleasers.yml
+++ b/src/Jackett.Common/Definitions/desireleasers.yml
@@ -36,19 +36,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
diff --git a/src/Jackett.Common/Definitions/diablotorrent.yml b/src/Jackett.Common/Definitions/diablotorrent.yml
index 421156838..2be50a1fd 100644
--- a/src/Jackett.Common/Definitions/diablotorrent.yml
+++ b/src/Jackett.Common/Definitions/diablotorrent.yml
@@ -68,10 +68,10 @@ login:
     referer: ""
     nev: "{{ .Config.username }}"
     jelszo: "{{ .Config.password }}"
-    fsv: "0"
-    login: "1"
-    belepes: "1"
-    rhash: "123"
+    fsv: 0
+    login: 1
+    belepes: 1
+    rhash: 123
   test:
     path: browse
 
@@ -81,11 +81,13 @@ search:
   inputs:
     $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
-    s_alapjan: "7"
-    s_sorrend: "desc"
+    s_alapjan: 7
+    s_sorrend: desc
+
   rows:
     selector: div.torrent_row, div.torrent_details
     after: 1
+
   fields:
     download:
       selector: div.box_download > a
@@ -113,7 +115,7 @@ search:
       selector: div.box_uploaded
       filters:
         - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
     size:
@@ -133,7 +135,7 @@ search:
       selector: div.torrent_row_magyarcim
       remove: span.torrent_row_new
     downloadvolumefactor:
-      text: "0"
+      text: 0
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd
diff --git a/src/Jackett.Common/Definitions/dimeadozen.yml b/src/Jackett.Common/Definitions/dimeadozen.yml
index 549b15207..c1bdf22d8 100644
--- a/src/Jackett.Common/Definitions/dimeadozen.yml
+++ b/src/Jackett.Common/Definitions/dimeadozen.yml
@@ -90,7 +90,7 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    returnto: "index.php"
+    returnto: index.php
     logout: ""
   error:
     - selector: table.message:contains("Error")
diff --git a/src/Jackett.Common/Definitions/divteam.yml b/src/Jackett.Common/Definitions/divteam.yml
index 3411bad1b..6c2d48d58 100644
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/src/Jackett.Common/Definitions/divteam.yml
@@ -73,19 +73,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
   - name: info_results
     type: info
     label: Results Per Page
diff --git a/src/Jackett.Common/Definitions/documentarytorrents.yml b/src/Jackett.Common/Definitions/documentarytorrents.yml
index 6f142c80c..6d6837849 100644
--- a/src/Jackett.Common/Definitions/documentarytorrents.yml
+++ b/src/Jackett.Common/Definitions/documentarytorrents.yml
@@ -92,19 +92,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: account-login.php
diff --git a/src/Jackett.Common/Definitions/dxdhd.yml b/src/Jackett.Common/Definitions/dxdhd.yml
index 42befe03a..9b87ce781 100644
--- a/src/Jackett.Common/Definitions/dxdhd.yml
+++ b/src/Jackett.Common/Definitions/dxdhd.yml
@@ -46,17 +46,17 @@ settings:
     label: Sort requested from site
     default: "created_at"
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
diff --git a/src/Jackett.Common/Definitions/dxp.yml b/src/Jackett.Common/Definitions/dxp.yml
index 4041ce93b..5724ecc00 100644
--- a/src/Jackett.Common/Definitions/dxp.yml
+++ b/src/Jackett.Common/Definitions/dxp.yml
@@ -55,19 +55,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php