diff --git a/src/Jackett.Common/Definitions/yggtorrent.yml b/src/Jackett.Common/Definitions/yggtorrent.yml
index dd9d51826..d8205e42c 100644
--- a/src/Jackett.Common/Definitions/yggtorrent.yml
+++ b/src/Jackett.Common/Definitions/yggtorrent.yml
@@ -25,9 +25,6 @@
     - https://ygg.to/
     - https://www.ygg.to/
     - https://ww3.yggtorrent.gg/
-
-
-
   caps:
     categorymappings:
       - {id: 2145, cat: TV, desc: "Film/Vidéo"}
@@ -157,10 +154,15 @@
 
   search:
     followredirect: true
+    keywordsfilters:
+      # Full season seach hack: Sonarrv3 send 'Series Name SXX' but it won't match 'Series Name - Saison 01' for example so we remove the 'SXX' ==> 'Series Name'
+      - name: re_replace
+        args: ["(.*)[sS](\\d{1,4})$", "$1"]
+      - name: replace
+        args: ["\"", ""]
     paths:
       - path: "https://{{ .Config.searchanddlurl }}/engine/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ re_replace .Keywords \"\\s\" \"\"\"\" }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date"
       - path: "https://{{ .Config.searchanddlurl }}/engine/search?category={{ .Config.category }}&name={{if .Config.enhancedAnime}}{{ re_replace .Keywords \"([\\.\\s\\[\\-])(\\d+)$\" \"$1e$2\" }}{{else}}{{ re_replace .Keywords \"\\s\" \"\"\"\" }}{{end}}&description=&file=&uploader=&sub_category=&do=search&order=desc&sort=publish_date&page=50"
-
     rows:
       selector: "table.table > tbody > tr"
     fields:
@@ -177,6 +179,14 @@
         filters:
           - name: re_replace
             args: ["(?i)^(?:(.+?)((?:[\\.\\-\\s_\\[]+(?:imax|(?:dvd|bd|tv)(?:rip|scr)|bluray(?:\\-?rip)?|720\\s*p?|1080\\s*p?|vof?|vost(?:fr)?|multi|vf(?:f|q)?[1-3]?|(?:true)?french|eng?)[\\.\\-\\s_\\]]*)*)([\\(\\[]?(?:20|1[7-9])\\d{2}[\\)\\]]?)(.*)$|(.*))$", "$1 $3 $2 $4 $5"]
+          # Replace Saison/saison by 'S' to match for Full season search Sonarrv3 and tidy up
+          - name: re_replace
+            args: ["([Ss]aison|[Ss]aison )(\\d{1,4})", "S$2"]
+          - name: re_replace
+            args: ["S(\\d+)E(\\d+)(\\D+)", "S$1E$2 $3"]
+          - name: re_replace
+            args: ["([Mm][Uu][Ll][Tt][Ii])", "MULTi"]
+          # End tidy up for sonarrv3 season search
           - name: replace
             args: [".", " "]
           - name: trim
@@ -205,62 +215,9 @@
         selector: ":nth-child(2) > a"
         attribute: href
       category:
-        selector: ":nth-child(2) > a"
-        case:
-          "a[href*=\"/filmvidéo/animation/\"]" : 2178
-          "a[href*=\"/film-video/animation/\"]" : 2178
-          "a[href*=\"/filmvidéo/animation-série/\"]" : 2179
-          "a[href*=\"/film-video/animation-serie/\"]" : 2179
-          "a[href*=\"/filmvidéo/concert/\"]" : 2180
-          "a[href*=\"/film-video/concert/\"]" : 2180
-          "a[href*=\"/filmvidéo/documentaire/\"]" : 2181
-          "a[href*=\"/film-video/documentaire/\"]" : 2181
-          "a[href*=\"/filmvidéo/emission-tv/\"]" : 2182
-          "a[href*=\"/film-video/emission-tv/\"]" : 2182
-          "a[href*=\"/filmvidéo/film/\"]" : 2183
-          "a[href*=\"/film-video/film/\"]" : 2183
-          "a[href*=\"/filmvidéo/série-tv/\"]" : 2184
-          "a[href*=\"/film-video/serie-tv/\"]" : 2184
-          "a[href*=\"/filmvidéo/spectacle/\"]" : 2185
-          "a[href*=\"/film-video/spectacle/\"]" : 2185
-          "a[href*=\"/filmvidéo/sport/\"]" : 2186
-          "a[href*=\"/film-video/sport/\"]" : 2186
-          "a[href*=\"/filmvidéo/vidéo-clips/\"]" : 2187
-          "a[href*=\"/film-video/video-clips/\"]" : 2187
-          "a[href*=\"/audio/karaoké/\"]" : 2147
-          "a[href*=\"/audio/musique/\"]" : 2148
-          "a[href*=\"/audio/podcast-radio/\"]" : 2150
-          "a[href*=\"/audio/samples/\"]" : 2149
-          "a[href*=\"/application/autre/\"]" : 2177
-          "a[href*=\"/application/formation/\"]" : 2176
-          "a[href*=\"/application/linux/\"]" : 2171
-          "a[href*=\"/application/macos/\"]" : 2172
-          "a[href*=\"/application/smartphone/\"]" : 2174
-          "a[href*=\"/application/tablette/\"]" : 2175
-          "a[href*=\"/application/windows/\"]" : 2173
-          "a[href*=\"/jeu-vidéo/autre/\"]" : 2167
-          "a[href*=\"/jeu-vidéo/linux/\"]" : 2159
-          "a[href*=\"/jeu-vidéo/macos/\"]" : 2160
-          "a[href*=\"/jeu-vidéo/microsoft/\"]" : 2162
-          "a[href*=\"/jeu-vidéo/nintendo/\"]" : 2163
-          "a[href*=\"/jeu-vidéo/smartphone/\"]" : 2165
-          "a[href*=\"/jeu-vidéo/sony/\"]" : 2164
-          "a[href*=\"/jeu-vidéo/tablette/\"]" : 2166
-          "a[href*=\"/jeu-vidéo/windows/\"]" : 2161
-          "a[href*=\"/ebook/audio/\"]" : 2151
-          "a[href*=\"/ebook/bds/\"]" : 2152
-          "a[href*=\"/ebook/comics/\"]" : 2153
-          "a[href*=\"/ebook/livres/\"]" : 2154
-          "a[href*=\"/ebook/mangas/\"]" : 2155
-          "a[href*=\"/ebook/presse/\"]" : 2156
-          "a[href*=\"/emulation/emulateurs/\"]" : 2157
-          "a[href*=\"/emulation/roms/\"]" : 2158
-          "a[href*=\"/gps/applications/\"]" : 2168
-          "a[href*=\"/gps/cartes/\"]" : 2169
-          "a[href*=\"/gps/divers/\"]" : 2170
-          "a[href*=\"/xxx/films/\"]" : 2189
-          "a[href*=\"/xxx/hentai/\"]" : 2190
-          "a[href*=\"/xxx/images/\"]" : 2191
+      # changed the catid into and hidden div as of last tracker problem
+        selector: ":nth-child(1) > div#hidden"
+        
       comments:
         optional: true
         selector: "td:nth-child(1) > a[href$=\"#comments\"]"