diff --git a/src/Jackett.Common/Definitions/aither-api.yml b/src/Jackett.Common/Definitions/aither-api.yml
index ae0573e61..c1f19a732 100644
--- a/src/Jackett.Common/Definitions/aither-api.yml
+++ b/src/Jackett.Common/Definitions/aither-api.yml
@@ -105,6 +105,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -173,9 +178,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/blutopia-api.yml b/src/Jackett.Common/Definitions/blutopia-api.yml
index fc662e826..cb0cc91d4 100644
--- a/src/Jackett.Common/Definitions/blutopia-api.yml
+++ b/src/Jackett.Common/Definitions/blutopia-api.yml
@@ -105,6 +105,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -173,9 +178,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/capybarabr.yml b/src/Jackett.Common/Definitions/capybarabr.yml
index 71f1db97b..913b8fef7 100644
--- a/src/Jackett.Common/Definitions/capybarabr.yml
+++ b/src/Jackett.Common/Definitions/capybarabr.yml
@@ -110,6 +110,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -178,9 +183,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/cinematik.yml b/src/Jackett.Common/Definitions/cinematik.yml
index f76005a19..27b45344d 100644
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/src/Jackett.Common/Definitions/cinematik.yml
@@ -107,6 +107,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -175,9 +180,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.1
+# json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/fearnopeer.yml b/src/Jackett.Common/Definitions/fearnopeer.yml
index 23fde9763..167168946 100644
--- a/src/Jackett.Common/Definitions/fearnopeer.yml
+++ b/src/Jackett.Common/Definitions/fearnopeer.yml
@@ -105,6 +105,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -170,9 +175,4 @@ search:
 # Maintain global ratio above 0.5 or downloads will get disabled. No MST.
     minimumratio:
       text: 0.51
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/hd-unit3d-api.yml b/src/Jackett.Common/Definitions/hd-unit3d-api.yml
index 60e54228a..6639d0661 100644
--- a/src/Jackett.Common/Definitions/hd-unit3d-api.yml
+++ b/src/Jackett.Common/Definitions/hd-unit3d-api.yml
@@ -104,6 +104,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -169,9 +174,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/hdtorrentsit.yml b/src/Jackett.Common/Definitions/hdtorrentsit.yml
index c8a29e68f..c5e48a8a7 100644
--- a/src/Jackett.Common/Definitions/hdtorrentsit.yml
+++ b/src/Jackett.Common/Definitions/hdtorrentsit.yml
@@ -103,6 +103,18 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
     details:
       selector: details_link
     download:
@@ -166,16 +178,4 @@ search:
         False: 1 # normal
         True: 2 # double
 # as a pay site there is no MR or MST
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
 # json UNIT3D 8.0.2 (custom)
diff --git a/src/Jackett.Common/Definitions/itatorrents.yml b/src/Jackett.Common/Definitions/itatorrents.yml
index c0ab0ff19..d0263bcd5 100644
--- a/src/Jackett.Common/Definitions/itatorrents.yml
+++ b/src/Jackett.Common/Definitions/itatorrents.yml
@@ -113,6 +113,18 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: ["\\.", " "]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
     details:
       selector: details_link
     download:
@@ -176,16 +188,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-      filters:
-        - name: re_replace
-          args: ["\\.", " "]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
 # json UNIT3D 8.0.2 (custom)
diff --git a/src/Jackett.Common/Definitions/lastdigitalunderground.yml b/src/Jackett.Common/Definitions/lastdigitalunderground.yml
index 6c52d4c54..33ad05de7 100644
--- a/src/Jackett.Common/Definitions/lastdigitalunderground.yml
+++ b/src/Jackett.Common/Definitions/lastdigitalunderground.yml
@@ -130,6 +130,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -198,9 +203,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.1
diff --git a/src/Jackett.Common/Definitions/lat-team-api.yml b/src/Jackett.Common/Definitions/lat-team-api.yml
index cb2637f5c..396f1069a 100644
--- a/src/Jackett.Common/Definitions/lat-team-api.yml
+++ b/src/Jackett.Common/Definitions/lat-team-api.yml
@@ -113,6 +113,16 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title_phase1:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    title_vose:
+      selector: name:contains(VOSE)
+      optional: true
+    title:
+      text: "{{ .Result.title_phase1 }}{{ if .Result.title_vose }} ENGLiSH{{ else }} SPANiSH{{ end }}"
     details:
       selector: details_link
     download:
@@ -181,14 +191,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title_phase1:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-    title_vose:
-      selector: name:contains(VOSE)
-      optional: true
-    title:
-      text: "{{ .Result.title_phase1 }}{{ if .Result.title_vose }} ENGLiSH{{ else }} SPANiSH{{ end }}"
 # json UNIT3D 8.0.2 (custom)
diff --git a/src/Jackett.Common/Definitions/lilleskyorg.yml b/src/Jackett.Common/Definitions/lilleskyorg.yml
index c0c62340c..fb6cab6d8 100644
--- a/src/Jackett.Common/Definitions/lilleskyorg.yml
+++ b/src/Jackett.Common/Definitions/lilleskyorg.yml
@@ -106,6 +106,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -170,9 +175,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/lst.yml b/src/Jackett.Common/Definitions/lst.yml
index 3330be48a..8ec689817 100644
--- a/src/Jackett.Common/Definitions/lst.yml
+++ b/src/Jackett.Common/Definitions/lst.yml
@@ -109,6 +109,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -177,9 +182,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/ntelogo.yml b/src/Jackett.Common/Definitions/ntelogo.yml
index a1caa7a6e..0dd8c10dc 100644
--- a/src/Jackett.Common/Definitions/ntelogo.yml
+++ b/src/Jackett.Common/Definitions/ntelogo.yml
@@ -107,6 +107,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
       filters:
         - name: re_replace
           args: ["\\.", " "]
@@ -175,9 +180,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/onlyencodes-api.yml b/src/Jackett.Common/Definitions/onlyencodes-api.yml
index 190713010..d4c813192 100644
--- a/src/Jackett.Common/Definitions/onlyencodes-api.yml
+++ b/src/Jackett.Common/Definitions/onlyencodes-api.yml
@@ -101,6 +101,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -169,9 +174,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/polishtorrent.yml b/src/Jackett.Common/Definitions/polishtorrent.yml
index 8c91a6748..d01836c5f 100644
--- a/src/Jackett.Common/Definitions/polishtorrent.yml
+++ b/src/Jackett.Common/Definitions/polishtorrent.yml
@@ -132,6 +132,20 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title_phase1:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
+        - name: re_replace
+          args: ["(?i)\\b(pl)\\b", "POLISH"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -197,18 +211,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title_phase1:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
-        - name: re_replace
-          args: ["(?i)\\b(pl)\\b", "POLISH"]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
 # json UNIT3D 8.0.1 (custom)
diff --git a/src/Jackett.Common/Definitions/reelflix-api.yml b/src/Jackett.Common/Definitions/reelflix-api.yml
index b63e3ff38..2fc226cd4 100644
--- a/src/Jackett.Common/Definitions/reelflix-api.yml
+++ b/src/Jackett.Common/Definitions/reelflix-api.yml
@@ -104,6 +104,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -168,9 +173,4 @@ search:
         True: 2 # double
     minimumratio:
       text: 1.0
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/rockethd.yml b/src/Jackett.Common/Definitions/rockethd.yml
index 1e2642eb3..559ad9d2d 100644
--- a/src/Jackett.Common/Definitions/rockethd.yml
+++ b/src/Jackett.Common/Definitions/rockethd.yml
@@ -97,6 +97,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -163,9 +168,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/shareisland-api.yml b/src/Jackett.Common/Definitions/shareisland-api.yml
index 2de92e991..4ee32e4a7 100644
--- a/src/Jackett.Common/Definitions/shareisland-api.yml
+++ b/src/Jackett.Common/Definitions/shareisland-api.yml
@@ -119,6 +119,35 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
+      filters:
+        - name: re_replace # replace special characters with " " (space)
+          args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
+        - name: diacritics
+          args: replace
+        - name: re_replace # replace multiple spaces
+          args: ["[ ]{2,}", " "]
+        # normalize to SXXEYY format
+        - name: re_replace # S01 E01 to S01E01
+          args: ["(?i)\\bS(\\d+)\\sE(\\d+)\\b", "S$1E$2"]
+        - name: re_replace # 01x01 to S01E01
+          args: ["(?i)(\\d{2})x(\\d+)", "S$1E$2"]
+        - name: re_replace # 1x01 to S01E01
+          args: ["(?i)\\b(\\d{1})x(\\d+)", "S0$1E$2"]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
+        - name: re_replace # Episodio 4 to E4
+          args: ["(?i)\\b(?:[\\/\\|]?Episodio\\s?(\\d+)|Puntata\\s?(\\d+))", "E$1$2"]
+        - name: re_replace # Episodi 4 5 to E04-05
+          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)", ""]
     details:
       selector: details_link
     download:
@@ -185,33 +214,4 @@ search:
     minimumseedtime:
       # 6 day (as seconds = 6 x 24 x 60 x 60)
       text: 518400
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-      filters:
-        - name: re_replace # replace special characters with " " (space)
-          args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
-        - name: diacritics
-          args: replace
-        - name: re_replace # replace multiple spaces
-          args: ["[ ]{2,}", " "]
-        # normalize to SXXEYY format
-        - name: re_replace # S01 E01 to S01E01
-          args: ["(?i)\\bS(\\d+)\\sE(\\d+)\\b", "S$1E$2"]
-        - name: re_replace # 01x01 to S01E01
-          args: ["(?i)(\\d{2})x(\\d+)", "S$1E$2"]
-        - name: re_replace # 1x01 to S01E01
-          args: ["(?i)\\b(\\d{1})x(\\d+)", "S0$1E$2"]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
-        - name: re_replace # Episodio 4 to E4
-          args: ["(?i)\\b(?:[\\/\\|]?Episodio\\s?(\\d+)|Puntata\\s?(\\d+))", "E$1$2"]
-        - name: re_replace # Episodi 4 5 to E04-05
-          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)", ""]
 # json UNIT3D 8.0.2 (custom)
diff --git a/src/Jackett.Common/Definitions/skipthecommercials-api.yml b/src/Jackett.Common/Definitions/skipthecommercials-api.yml
index 3b68290ec..1bb04edc0 100644
--- a/src/Jackett.Common/Definitions/skipthecommercials-api.yml
+++ b/src/Jackett.Common/Definitions/skipthecommercials-api.yml
@@ -101,6 +101,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -166,9 +171,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/skipthetrailers.yml b/src/Jackett.Common/Definitions/skipthetrailers.yml
index d51e61e0c..d38e4fc6b 100644
--- a/src/Jackett.Common/Definitions/skipthetrailers.yml
+++ b/src/Jackett.Common/Definitions/skipthetrailers.yml
@@ -100,6 +100,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -165,9 +170,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
-# json UNIT3D 8.0.1
+# json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/tocashare.yml b/src/Jackett.Common/Definitions/tocashare.yml
index 03425991c..d5025e177 100644
--- a/src/Jackett.Common/Definitions/tocashare.yml
+++ b/src/Jackett.Common/Definitions/tocashare.yml
@@ -113,6 +113,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -181,9 +186,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/torrenteros-api.yml b/src/Jackett.Common/Definitions/torrenteros-api.yml
index 296e0971a..d5a54faa0 100644
--- a/src/Jackett.Common/Definitions/torrenteros-api.yml
+++ b/src/Jackett.Common/Definitions/torrenteros-api.yml
@@ -97,6 +97,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -165,9 +170,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2
diff --git a/src/Jackett.Common/Definitions/uploadcx.yml b/src/Jackett.Common/Definitions/uploadcx.yml
index 36e01acb5..ad82b70ec 100644
--- a/src/Jackett.Common/Definitions/uploadcx.yml
+++ b/src/Jackett.Common/Definitions/uploadcx.yml
@@ -101,6 +101,11 @@ search:
       selector: category_id
     title_optional:
       selector: name
+    title_filename:
+      selector: "files[0].name"
+      optional: true
+    title:
+      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
     details:
       selector: details_link
     download:
@@ -169,9 +174,4 @@ search:
     minimumseedtime:
       # 2 day (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-    title_filename:
-      selector: "files[0].name"
-      optional: true
-    title:
-      text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}"
 # json UNIT3D 8.0.2