diff --git a/src/Jackett.Common/Definitions/ilcorsaronero.yml b/src/Jackett.Common/Definitions/ilcorsaronero.yml
index 546a68ab7..af1f3d077 100644
--- a/src/Jackett.Common/Definitions/ilcorsaronero.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml
@@ -57,12 +57,12 @@ settings:
 
 search:
   paths:
-    - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=0{{else}}/browse/0{{end}}"
-    - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=1{{else}}/browse/1{{end}}"
-    - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=2{{else}}/browse/2{{end}}"
-    - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=3{{else}}/browse/3{{end}}"
-    - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=4{{else}}/browse/4{{end}}"
-    - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=5{{else}}/browse/5{{end}}"
+    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{ . }};{{end}}&search={{  .Keywords }}&order=data&by=DESC&page=0{{ else }}/browse/0{{ end }}"
+    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{ . }};{{end}}&search={{  .Keywords }}&order=data&by=DESC&page=1{{ else }}/browse/1{{ end }}"
+    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{ . }};{{end}}&search={{  .Keywords }}&order=data&by=DESC&page=2{{ else }}/browse/2{{ end }}"
+    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{ . }};{{end}}&search={{  .Keywords }}&order=data&by=DESC&page=3{{ else }}/browse/3{{ end }}"
+    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{ . }};{{end}}&search={{  .Keywords }}&order=data&by=DESC&page=4{{ else }}/browse/4{{ end }}"
+    - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{ . }};{{end}}&search={{  .Keywords }}&order=data&by=DESC&page=5{{ else }}/browse/5{{ end }}"
   keywordsfilters:
     - name: re_replace # S01 to 1
       args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
@@ -75,6 +75,12 @@ search:
       - name: andmatch
 
   fields:
+    category:
+      selector: td:nth-child(1) a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", -1]
     title:
       selector: td:nth-child(2) a.tab
       attribute: href
@@ -105,12 +111,6 @@ search:
           args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
         - name: re_replace # rimozioni varie
           args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
-    category:
-      selector: td:nth-child(1) a
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", -1]
     description:
       selector: td:nth-child(1) a
       attribute: href
@@ -131,22 +131,19 @@ search:
         - name: append
           args: ".torrent"
     download:
-      text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{else}}{{end}}"
-    magnet:
+      text: "{{ if .Config.itorrents-links }}{{ .Result.download-itorrents }}{{ else }}{{ end }}"
+    infohash:
       selector: input.downarrow
       attribute: value
-      filters:
-        - name: prepend
-          args: "magnet:?xt=urn:btih:"
-        - name: append
-          args: "&dn={{ .Result.title }}.torrent&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://tracker.opentrackr.org:1337"
     size:
       selector: td:nth-child(3) font
     date:
       selector: td:nth-child(5) font
       filters:
+        - name: append
+          args: " +01:00" # CET
         - name: dateparse
-          args: "02.01.06"
+          args: "02.01.06 -07:00"
     seeders:
       selector: td:nth-child(6) font
       filters: