diff --git a/src/Jackett.Common/Definitions/torrentz2.yml b/src/Jackett.Common/Definitions/torrentz2.yml
index a714ee9d5..d036f2ab1 100644
--- a/src/Jackett.Common/Definitions/torrentz2.yml
+++ b/src/Jackett.Common/Definitions/torrentz2.yml
@@ -29,6 +29,7 @@
       "game": PC/Games
       "game pc": PC/Games
       "game xbox": Console/Xbox
+      "game nintendo": Console/NDS
       "adult": XXX
       "adult amateur": XXX
       "adult anal": XXX
@@ -38,6 +39,7 @@
       "adult double p": XXX
       "adult fisting": XXX
       "adult hairy": XXX
+      "adult hentai": XXX
       "adult lesbian": XXX
       "adult milf": XXX
       "adult squirting": XXX
@@ -64,17 +66,35 @@
       type: checkbox
       label: "Only include verifed content in results"
       default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "A"
+      options:
+        "A": "created"
+        "P": "seeders"
+        "S": "size"
 
   search:
     paths:
-      - path: "{{if .Config.filter-verified }}verified{{else}}searchA{{end}}"
+      - path: "{{if .Config.filter-verified }}verified{{else}}search{{end}}{{ .Config.sort }}"
     inputs:
-       f: "{{if .Keywords }}title: {{else}}{{end}}{{ .Keywords }}"
-       safe: "{{if .Config.filter-safe }}1{{else}}0{{end}}"
+       f: "{{ if .Keywords }}title: {{ .Keywords }}{{else}}{{end}}"
+       safe: "{{ if .Config.filter-safe }}1{{else}}0{{end}}"
+
     rows:
       selector: "html body #wrap .results dl:has(a)"
-    # andmatch filter removed, see #3737
+      # andmatch filter removed, see #3737
+
     fields:
+      category:
+        optional: true
+        selector: dt
+        remove: a
+        filters:
+          - name: re_replace
+            args:  ["[^a-zA-Z\\s]+", ""]
+          - name: trim
       title:
         selector: dt a
       details:
@@ -108,14 +128,6 @@
             args: "magnet:?xt=urn:btih:"
           - name: append
             args: "&dn={{ .Result.magfile }}.torrent&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://tracker.opentrackr.org:1337"
-      category:
-        optional: true
-        selector: dt
-        remove: a
-        filters:
-          - name: re_replace
-            args:  ["[^a-zA-Z\\s]+", ""]
-          - name: trim
       date:
         selector: dd span:nth-child(2)
         attribute: title
@@ -126,6 +138,6 @@
       leechers:
         selector: dd span:nth-child(5)
       downloadvolumefactor:
-        text: "0"
+        text: 0
       uploadvolumefactor:
-        text: "1"
+        text: 1