diff --git a/src/Jackett.Common/Definitions/jpopsuki.yml b/src/Jackett.Common/Definitions/jpopsuki.yml
index b71acfdfe..392689b01 100644
--- a/src/Jackett.Common/Definitions/jpopsuki.yml
+++ b/src/Jackett.Common/Definitions/jpopsuki.yml
@@ -50,23 +50,35 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
-    order_by: time
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    searchstr: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
+    # s1 name, s2 year, s3 added, s4 size, s5 snatched, s6 seeders, s7 leechers
+    order_by: s3
+    # desc, asc
     order_way: desc
+    # basic, advanced
     action: basic
-    searchsubmit: 1
+    # 0 any, 1 all
+    searchtags: 0
     disablegrouping: 1
+
   rows:
     selector: table#torrent_table > tbody > tr[class^="torrent"]
+
   fields:
+    category:
+      selector: a[href*="filter_cat"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "%5B(\\d+?)%5D"
     download:
       selector: a[href^="torrents.php?action=download&id="]
       attribute: href
     description:
       selector: div.tags
     title:
-      selector: td:nth-child(2)
+      selector: td:nth-last-child(7)
       remove: span, div.tags, a[title="View Comments"]
       filters:
         - name: replace
@@ -75,22 +87,17 @@ search:
           args: ["\t", ""]
         - name: replace
           args: [" / Freeleech!", ""]
-    category:
-      selector: a[href*="filter_cat"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "%5B(\\d+?)%5D"
     details:
       selector: a[href^="torrents.php?id="]
       attribute: href
     banner:
-      selector: td:nth-child(2) img
+      selector: img[src^="static/images/torrents/"]
       attribute: src
+      optional: true
     files:
-      selector: td:nth-child(3)
+      selector: td:nth-last-child(6)
     date:
-      selector: td:nth-child(4)
+      selector: td:nth-last-child(5)
       attribute: title
       filters:
         - name: append
@@ -98,17 +105,17 @@ search:
         - name: dateparse
           args: "Jan 02 2006, 15:04 -07:00"
     size:
-      selector: td:nth-child(5)
+      selector: td:nth-last-child(4)
     grabs:
-      selector: td:nth-child(6)
+      selector: td:nth-last-child(3)
     seeders:
-      selector: td:nth-child(7)
+      selector: td:nth-last-child(2)
     leechers:
-      selector: td:nth-child(8)
+      selector: td:nth-last-child(1)
     downloadvolumefactor:
       case:
-        "strong:contains(\"Freeleech!\")": "0"
-        "*": "1"
+        "strong:contains(\"Freeleech!\")": 0
+        "*": 1
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine n/a