diff --git a/src/Jackett.Common/Definitions/gfxpeers.yml b/src/Jackett.Common/Definitions/gfxpeers.yml
index 94b915be2..fb7c4ffd8 100644
--- a/src/Jackett.Common/Definitions/gfxpeers.yml
+++ b/src/Jackett.Common/Definitions/gfxpeers.yml
@@ -27,7 +27,7 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    keeplogged: "1"
+    keeplogged: 1
   error:
     - selector: .auth_form > .warning
   test:
@@ -38,51 +38,46 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Query.Keywords }}"
-    order_by: "time"
-    order_way: "desc"
-    action: "advanced"
-    searchsubmit: "1"
+    searchstr: "{{ .Keywords }}"
+    order_by: time
+    order_way: desc
+    action: advanced
+    searchsubmit: 1
 
   rows:
     selector: table#torrent_table > tbody > tr.torrent
+
   fields:
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    title:
-      selector: a[href^="torrents.php?id="]
-    downloadvolumefactor:
-      case:
-        "*": "1"
-    uploadvolumefactor:
-      case:
-        "*": "1"
     category:
       selector: a[href^="torrents.php?filter_cat"]
       attribute: href
       filters:
         - name: regexp
           args: "\\[(\\d+?)\\]"
+    title:
+      selector: a[href^="torrents.php?id="]
     details:
       selector: a[href^="torrents.php?id="]
       attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(4)
     size:
       selector: td:nth-child(5)
     grabs:
       selector: td:nth-child(6)
-    files:
-      selector: td:nth-child(3)
     seeders:
       selector: td:nth-child(7)
     leechers:
       selector: td:nth-child(8)
-    date:
-      selector: td:nth-child(4)
     downloadvolumefactor:
       case:
-        "strong.tl_free": "0"
-        "*": "1"
+        "strong.tl_free": 0
+        "*": 1
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine n/a