diff --git a/src/Jackett.Common/Definitions/aftershock.yml b/src/Jackett.Common/Definitions/aftershock.yml
index 34e973500..8149cb5ba 100644
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/src/Jackett.Common/Definitions/aftershock.yml
@@ -148,7 +148,6 @@ search:
       attribute: href
     genre:
       selector: span.box
-      optional: true
     description:
       text: "{{ .Result.genre }}"
     files:
diff --git a/src/Jackett.Common/Definitions/amigosshare.yml b/src/Jackett.Common/Definitions/amigosshare.yml
index 9a01cf8e3..8f1996abf 100644
--- a/src/Jackett.Common/Definitions/amigosshare.yml
+++ b/src/Jackett.Common/Definitions/amigosshare.yml
@@ -188,7 +188,6 @@ search:
       optional: true
     genre:
       selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#1c38c2;"]
-      optional: true
     description:
       text: "{{ .Result.genre }}"
     title:
diff --git a/src/Jackett.Common/Definitions/carphunter.yml b/src/Jackett.Common/Definitions/carphunter.yml
index 8250df66e..e729fc1b9 100644
--- a/src/Jackett.Common/Definitions/carphunter.yml
+++ b/src/Jackett.Common/Definitions/carphunter.yml
@@ -129,7 +129,6 @@ search:
       attribute: href
     genre:
       selector: i
-      optional: true
     description:
       text: "{{ .Result.genre }}"
     poster:
diff --git a/src/Jackett.Common/Definitions/cathoderaytube.yml b/src/Jackett.Common/Definitions/cathoderaytube.yml
index 654d5d9bd..8d1efb273 100644
--- a/src/Jackett.Common/Definitions/cathoderaytube.yml
+++ b/src/Jackett.Common/Definitions/cathoderaytube.yml
@@ -105,7 +105,6 @@ search:
       attribute: href
     genre:
       selector: div.tags
-      optional: true
       filters:
         - name: validate
           args: "Action, Adventure, Animation, Comedy, Crime, Documentary, Drama, Family, Fantasy, History, Horror, Kids, Music, Mystery, News, Reality, Romance, SciFi, Soap, Talk, Thriller, War, Western"
diff --git a/src/Jackett.Common/Definitions/catorrent.yml b/src/Jackett.Common/Definitions/catorrent.yml
index a51b51e6a..8fdff4b68 100644
--- a/src/Jackett.Common/Definitions/catorrent.yml
+++ b/src/Jackett.Common/Definitions/catorrent.yml
@@ -89,7 +89,6 @@ search:
       selector: img
       attribute: src
     genre:
-      optional: true
       selector: div.short_game_genre
     description:
       text: "{{ .Result.genre }}"
diff --git a/src/Jackett.Common/Definitions/cinemamovies.yml b/src/Jackett.Common/Definitions/cinemamovies.yml
index 5fb4aacdd..32904af25 100644
--- a/src/Jackett.Common/Definitions/cinemamovies.yml
+++ b/src/Jackett.Common/Definitions/cinemamovies.yml
@@ -151,7 +151,6 @@ search:
       attribute: href
     genre:
       selector: td[align="right"][width="66%"][valign="bottom"]
-      optional: true
       filters:
         - name: replace
           args: ["\xA0", " "]
diff --git a/src/Jackett.Common/Definitions/crazyhd.yml b/src/Jackett.Common/Definitions/crazyhd.yml
index 34dfe2981..e70dff6a4 100644
--- a/src/Jackett.Common/Definitions/crazyhd.yml
+++ b/src/Jackett.Common/Definitions/crazyhd.yml
@@ -185,7 +185,6 @@ search:
         - name: append
           args: "&f={{ .Result.title }}.torrent"
     genre:
-      optional: true
       selector: div.col-md-12
       filters:
         - name: validate
diff --git a/src/Jackett.Common/Definitions/datatalli.yml b/src/Jackett.Common/Definitions/datatalli.yml
index 42f820b9a..55de59928 100644
--- a/src/Jackett.Common/Definitions/datatalli.yml
+++ b/src/Jackett.Common/Definitions/datatalli.yml
@@ -156,7 +156,6 @@ search:
     uploadvolumefactor:
       text: 1
     genre:
-      optional: true
       selector: td:nth-child(2)
       remove: a
       filters:
diff --git a/src/Jackett.Common/Definitions/digitalcore.yml b/src/Jackett.Common/Definitions/digitalcore.yml
index 381a54f7a..ff5befecf 100644
--- a/src/Jackett.Common/Definitions/digitalcore.yml
+++ b/src/Jackett.Common/Definitions/digitalcore.yml
@@ -178,7 +178,6 @@ search:
       optional: true
       selector: year
     genre:
-      optional: true
       selector: genres
     _tagline_desc:
       optional: true
diff --git a/src/Jackett.Common/Definitions/estone.yml b/src/Jackett.Common/Definitions/estone.yml
index 1809969ad..64c036ee1 100644
--- a/src/Jackett.Common/Definitions/estone.yml
+++ b/src/Jackett.Common/Definitions/estone.yml
@@ -154,7 +154,6 @@ search:
         img[src="pic/dupla_up.png"]: 2
         "*": 1
     genre:
-      optional: true
       selector: div i
       filters:
         - name: regexp
diff --git a/src/Jackett.Common/Definitions/hdmonkey.yml b/src/Jackett.Common/Definitions/hdmonkey.yml
index e995ae5de..a095edeee 100644
--- a/src/Jackett.Common/Definitions/hdmonkey.yml
+++ b/src/Jackett.Common/Definitions/hdmonkey.yml
@@ -147,7 +147,6 @@ search:
     leechers:
       selector: td:nth-child(9)
     genre:
-      optional: true
       selector: a:contains("Genre:")
       filters:
         - name: replace
diff --git a/src/Jackett.Common/Definitions/krazyzone.yml b/src/Jackett.Common/Definitions/krazyzone.yml
index eb5395579..9f9f440f5 100644
--- a/src/Jackett.Common/Definitions/krazyzone.yml
+++ b/src/Jackett.Common/Definitions/krazyzone.yml
@@ -156,7 +156,6 @@ search:
         - name: regexp
           args: src=([^\s]+)
     genre:
-      optional: true
       selector: div.t-tags
       filters:
         - name: validate
diff --git a/src/Jackett.Common/Definitions/lastfiles.yml b/src/Jackett.Common/Definitions/lastfiles.yml
index 74dbe19c5..c415ff02f 100644
--- a/src/Jackett.Common/Definitions/lastfiles.yml
+++ b/src/Jackett.Common/Definitions/lastfiles.yml
@@ -162,7 +162,6 @@ search:
           args: ["./pic/noposter.png", ""]
     genre:
       selector: font[size]
-      optional: true
     description:
       text: "{{ .Result.genre }}"
     download:
diff --git a/src/Jackett.Common/Definitions/polishsource.yml b/src/Jackett.Common/Definitions/polishsource.yml
index 9532050e8..970a177ec 100644
--- a/src/Jackett.Common/Definitions/polishsource.yml
+++ b/src/Jackett.Common/Definitions/polishsource.yml
@@ -132,7 +132,6 @@ search:
       selector: a[href^="downloadssl.php?id="]
       attribute: href
     genre:
-      optional: true
       selector: td:nth-child(2) > small
       filters:
         - name: replace
diff --git a/src/Jackett.Common/Definitions/rptorrents.yml b/src/Jackett.Common/Definitions/rptorrents.yml
index 718ee4f51..05f829c50 100644
--- a/src/Jackett.Common/Definitions/rptorrents.yml
+++ b/src/Jackett.Common/Definitions/rptorrents.yml
@@ -156,7 +156,6 @@ search:
         img[src="images/t_extern.png"]: 0
         "*": 1
     genre:
-      optional: true
       selector: td div
       filters:
         - name: regexp
diff --git a/src/Jackett.Common/Definitions/superbits.yml b/src/Jackett.Common/Definitions/superbits.yml
index 7b01861c3..7e7d2cfb7 100644
--- a/src/Jackett.Common/Definitions/superbits.yml
+++ b/src/Jackett.Common/Definitions/superbits.yml
@@ -179,7 +179,6 @@ search:
       optional: true
       selector: year
     genre:
-      optional: true
       selector: genres
     _tagline_desc:
       optional: true
diff --git a/src/Jackett.Common/Definitions/teracod.yml b/src/Jackett.Common/Definitions/teracod.yml
index 84411abb2..904fbbceb 100644
--- a/src/Jackett.Common/Definitions/teracod.yml
+++ b/src/Jackett.Common/Definitions/teracod.yml
@@ -172,7 +172,6 @@ search:
         "font[color=\"#2A821E\"]:contains(\"x2\")": 2
         "*": 1
     genre:
-      optional: true
       selector: td.torrent:nth-child(2)
       filters:
         - name: regexp
diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
index 651d31621..5fb3677a6 100644
--- a/src/Jackett.Common/Indexers/CardigannIndexer.cs
+++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -38,7 +38,7 @@ namespace Jackett.Common.Indexers
             set => base.configData = value;
         }
 
-        protected readonly string[] OptionalFields = { "imdb", "imdbid", "tmdbid", "rageid", "tvdbid", "tvmazeid", "traktid", "doubanid", "poster", "description" };
+        protected readonly string[] OptionalFields = { "imdb", "imdbid", "tmdbid", "rageid", "tvdbid", "tvmazeid", "traktid", "doubanid", "poster", "genre", "description" };
 
         private static readonly string[] _SupportedLogicFunctions =
         {