diff --git a/src/Jackett.Common/Definitions/audiobookbay.yml b/src/Jackett.Common/Definitions/audiobookbay.yml
index 4bb55d826..48a1e87ff 100644
--- a/src/Jackett.Common/Definitions/audiobookbay.yml
+++ b/src/Jackett.Common/Definitions/audiobookbay.yml
@@ -74,6 +74,7 @@ caps:
 
   modes:
     search: [q]
+    book-search: [q]
 
 settings: []
 
diff --git a/src/Jackett.Common/Definitions/pixelcove.yml b/src/Jackett.Common/Definitions/pixelcove.yml
index 8380ae680..887944313 100644
--- a/src/Jackett.Common/Definitions/pixelcove.yml
+++ b/src/Jackett.Common/Definitions/pixelcove.yml
@@ -57,6 +57,7 @@ caps:
 
   modes:
     search: [q]
+    music-search: [q]
     book-search: [q]
 
 settings:
diff --git a/src/Jackett.Common/Indexers/AniDUB.cs b/src/Jackett.Common/Indexers/AniDUB.cs
index dd791a6af..5a28d4a5c 100644
--- a/src/Jackett.Common/Indexers/AniDUB.cs
+++ b/src/Jackett.Common/Indexers/AniDUB.cs
@@ -34,10 +34,17 @@ namespace Jackett.Common.Indexers
                    link: "https://tr.anidub.com/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music, movie, book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/AwesomeHD.cs b/src/Jackett.Common/Indexers/AwesomeHD.cs
index fd0e23c58..1437e3c1d 100644
--- a/src/Jackett.Common/Indexers/AwesomeHD.cs
+++ b/src/Jackett.Common/Indexers/AwesomeHD.cs
@@ -31,7 +31,6 @@ namespace Jackett.Common.Indexers
                    link: "https://awesome-hd.me/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -39,6 +38,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/BB.cs b/src/Jackett.Common/Indexers/BB.cs
index a12a1387e..76bd2e70c 100644
--- a/src/Jackett.Common/Indexers/BB.cs
+++ b/src/Jackett.Common/Indexers/BB.cs
@@ -38,8 +38,8 @@ namespace Jackett.Common.Indexers
                    name: "bB",
                    description: "bB is a Private Torrent Tracker for 0DAY / GENERAL",
                    link: StringUtil.FromBase64("aHR0cHM6Ly9iYWNvbmJpdHMub3JnLw=="),
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -47,6 +47,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs
index f575759fe..b49c7676d 100644
--- a/src/Jackett.Common/Indexers/BJShare.cs
+++ b/src/Jackett.Common/Indexers/BJShare.cs
@@ -67,7 +67,6 @@ namespace Jackett.Common.Indexers
                     link: "https://bj-share.info/",
                     caps: new TorznabCapabilities
                     {
-                        // TODO: add music and book search
                         TvSearchParams = new List<TvSearchParam>
                         {
                             TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -75,6 +74,14 @@ namespace Jackett.Common.Indexers
                         MovieSearchParams = new List<MovieSearchParam>
                         {
                             MovieSearchParam.Q, MovieSearchParam.ImdbId
+                        },
+                        MusicSearchParams = new List<MusicSearchParam>
+                        {
+                            MusicSearchParam.Q
+                        },
+                        BookSearchParams = new List<BookSearchParam>
+                        {
+                            BookSearchParam.Q
                         }
                     },
                     configService: configService,
diff --git a/src/Jackett.Common/Indexers/BakaBT.cs b/src/Jackett.Common/Indexers/BakaBT.cs
index ea31e16a4..695c8d131 100644
--- a/src/Jackett.Common/Indexers/BakaBT.cs
+++ b/src/Jackett.Common/Indexers/BakaBT.cs
@@ -42,10 +42,17 @@ namespace Jackett.Common.Indexers
                    link: "https://bakabt.me/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/BitCityReloaded.cs b/src/Jackett.Common/Indexers/BitCityReloaded.cs
index 8d0d416fb..5d773969e 100644
--- a/src/Jackett.Common/Indexers/BitCityReloaded.cs
+++ b/src/Jackett.Common/Indexers/BitCityReloaded.cs
@@ -35,8 +35,8 @@ namespace Jackett.Common.Indexers
                    name: "Bit-City Reloaded",
                    description: "A German general tracker.",
                    link: "https://bc-reloaded.net/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -44,6 +44,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/CorsaroRed.cs b/src/Jackett.Common/Indexers/CorsaroRed.cs
index 8c2506f94..a7d57498b 100644
--- a/src/Jackett.Common/Indexers/CorsaroRed.cs
+++ b/src/Jackett.Common/Indexers/CorsaroRed.cs
@@ -50,8 +50,8 @@ namespace Jackett.Common.Indexers
                    name: "Corsaro.red",
                    description: "Italian Torrents",
                    link: "https://corsaro.red/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -59,6 +59,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/DarmoweTorrenty.cs b/src/Jackett.Common/Indexers/DarmoweTorrenty.cs
index 46cd4bc73..312546313 100644
--- a/src/Jackett.Common/Indexers/DarmoweTorrenty.cs
+++ b/src/Jackett.Common/Indexers/DarmoweTorrenty.cs
@@ -40,8 +40,8 @@ namespace Jackett.Common.Indexers
                    name: "Darmowe torenty",
                    description: "Darmowe torenty is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL",
                    link: "https://darmowe-torenty.pl/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -49,6 +49,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/DigitalCore.cs b/src/Jackett.Common/Indexers/DigitalCore.cs
index 8d1ddc814..0ab38f768 100644
--- a/src/Jackett.Common/Indexers/DigitalCore.cs
+++ b/src/Jackett.Common/Indexers/DigitalCore.cs
@@ -36,7 +36,6 @@ namespace Jackett.Common.Indexers
                    link: "https://digitalcore.club/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -44,6 +43,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/EliteTracker.cs b/src/Jackett.Common/Indexers/EliteTracker.cs
index 16d463bb7..5dc2d9a6b 100644
--- a/src/Jackett.Common/Indexers/EliteTracker.cs
+++ b/src/Jackett.Common/Indexers/EliteTracker.cs
@@ -31,7 +31,6 @@ namespace Jackett.Common.Indexers
                    link: "https://elite-tracker.net/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -39,6 +38,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/EpubLibre.cs b/src/Jackett.Common/Indexers/EpubLibre.cs
index 06c52dcd9..e0aa1da98 100644
--- a/src/Jackett.Common/Indexers/EpubLibre.cs
+++ b/src/Jackett.Common/Indexers/EpubLibre.cs
@@ -53,8 +53,13 @@ namespace Jackett.Common.Indexers
                    name: "EpubLibre",
                    description: "Más libros, Más libres",
                    link: "https://epublibre.org/",
-                   // TODO: add book search
-                   caps: new TorznabCapabilities(),
+                   caps: new TorznabCapabilities
+                   {
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q // TODO: add more book parameters
+                       }
+                   },
                    configService: configService,
                    client: wc,
                    logger: l,
diff --git a/src/Jackett.Common/Indexers/FileList.cs b/src/Jackett.Common/Indexers/FileList.cs
index f67eda7ba..2907c3e91 100644
--- a/src/Jackett.Common/Indexers/FileList.cs
+++ b/src/Jackett.Common/Indexers/FileList.cs
@@ -37,7 +37,6 @@ namespace Jackett.Common.Indexers
                    link: "https://filelist.io/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -45,6 +44,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/FunFile.cs b/src/Jackett.Common/Indexers/FunFile.cs
index 60974d909..f5b8f8343 100644
--- a/src/Jackett.Common/Indexers/FunFile.cs
+++ b/src/Jackett.Common/Indexers/FunFile.cs
@@ -30,7 +30,6 @@ namespace Jackett.Common.Indexers
                    link: "https://www.funfile.org/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -38,6 +37,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/Fuzer.cs b/src/Jackett.Common/Indexers/Fuzer.cs
index d31e2911a..26842b987 100644
--- a/src/Jackett.Common/Indexers/Fuzer.cs
+++ b/src/Jackett.Common/Indexers/Fuzer.cs
@@ -43,7 +43,6 @@ namespace Jackett.Common.Indexers
                    link: "https://www.fuzer.me/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -51,6 +50,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/GimmePeers.cs b/src/Jackett.Common/Indexers/GimmePeers.cs
index f58b67abf..1c620f2ec 100644
--- a/src/Jackett.Common/Indexers/GimmePeers.cs
+++ b/src/Jackett.Common/Indexers/GimmePeers.cs
@@ -34,8 +34,8 @@ namespace Jackett.Common.Indexers
                    name: "GimmePeers",
                    description: "Formerly ILT",
                    link: "https://www.gimmepeers.com/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -43,6 +43,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs
index ed349b5b6..9b9a175ba 100644
--- a/src/Jackett.Common/Indexers/HDSpace.cs
+++ b/src/Jackett.Common/Indexers/HDSpace.cs
@@ -32,7 +32,6 @@ namespace Jackett.Common.Indexers
                    link: "https://hd-space.org/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -40,6 +39,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/HDTorrents.cs b/src/Jackett.Common/Indexers/HDTorrents.cs
index 440eacbb3..ff46e363d 100644
--- a/src/Jackett.Common/Indexers/HDTorrents.cs
+++ b/src/Jackett.Common/Indexers/HDTorrents.cs
@@ -51,7 +51,6 @@ namespace Jackett.Common.Indexers
                    link: "https://hdts.ru/", // Domain https://hdts.ru/ seems more reliable
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -59,6 +58,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/Hebits.cs b/src/Jackett.Common/Indexers/Hebits.cs
index 787beb1c2..7bdc60138 100644
--- a/src/Jackett.Common/Indexers/Hebits.cs
+++ b/src/Jackett.Common/Indexers/Hebits.cs
@@ -34,8 +34,8 @@ namespace Jackett.Common.Indexers
                    name: "Hebits",
                    description: "The Israeli Tracker",
                    link: "https://hebits.net/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -43,6 +43,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/IPTorrents.cs b/src/Jackett.Common/Indexers/IPTorrents.cs
index 932e38183..46076a7e9 100644
--- a/src/Jackett.Common/Indexers/IPTorrents.cs
+++ b/src/Jackett.Common/Indexers/IPTorrents.cs
@@ -56,7 +56,6 @@ namespace Jackett.Common.Indexers
                    link: "https://iptorrents.com/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -64,6 +63,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/IceTorrent.cs b/src/Jackett.Common/Indexers/IceTorrent.cs
index 94c6c20d4..82a2c2a44 100644
--- a/src/Jackett.Common/Indexers/IceTorrent.cs
+++ b/src/Jackett.Common/Indexers/IceTorrent.cs
@@ -23,7 +23,6 @@ namespace Jackett.Common.Indexers
                 link: "https://icetorrent.org/",
                 caps: new TorznabCapabilities
                 {
-                    // TODO: add music and book search
                     TvSearchParams = new List<TvSearchParam>
                     {
                         TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -31,6 +30,14 @@ namespace Jackett.Common.Indexers
                     MovieSearchParams = new List<MovieSearchParam>
                     {
                         MovieSearchParam.Q, MovieSearchParam.ImdbId
+                    },
+                    MusicSearchParams = new List<MusicSearchParam>
+                    {
+                        MusicSearchParam.Q
+                    },
+                    BookSearchParams = new List<BookSearchParam>
+                    {
+                        BookSearchParam.Q
                     }
                 },
                 configService: configService,
diff --git a/src/Jackett.Common/Indexers/ImmortalSeed.cs b/src/Jackett.Common/Indexers/ImmortalSeed.cs
index 8a0194647..fa8cf1d5a 100644
--- a/src/Jackett.Common/Indexers/ImmortalSeed.cs
+++ b/src/Jackett.Common/Indexers/ImmortalSeed.cs
@@ -38,8 +38,8 @@ namespace Jackett.Common.Indexers
                    name: "ImmortalSeed",
                    description: "ImmortalSeed (iS) is a Private Torrent Tracker for MOVIES / TV / GENERAL",
                    link: "https://immortalseed.me/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -47,6 +47,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/InternetArchive.cs b/src/Jackett.Common/Indexers/InternetArchive.cs
index ce5f2020e..6302e4077 100644
--- a/src/Jackett.Common/Indexers/InternetArchive.cs
+++ b/src/Jackett.Common/Indexers/InternetArchive.cs
@@ -46,8 +46,8 @@ namespace Jackett.Common.Indexers
                    name: "Internet Archive",
                    description: "Internet Archive is a non-profit digital library offering free universal access to books, movies & music, as well as 406 billion archived web pages",
                    link: "https://archive.org/",
-                   caps: new TorznabCapabilities{
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q
@@ -55,6 +55,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/MejorTorrent.cs b/src/Jackett.Common/Indexers/MejorTorrent.cs
index b853b37f7..0f92625e8 100644
--- a/src/Jackett.Common/Indexers/MejorTorrent.cs
+++ b/src/Jackett.Common/Indexers/MejorTorrent.cs
@@ -48,8 +48,8 @@ namespace Jackett.Common.Indexers
                    name: "MejorTorrent",
                    description: "MejorTorrent - Hay veces que un torrent viene mejor! :)",
                    link: "https://www.mejortorrentt.net/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -57,6 +57,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/Milkie.cs b/src/Jackett.Common/Indexers/Milkie.cs
index 8d1023365..c3d86148d 100644
--- a/src/Jackett.Common/Indexers/Milkie.cs
+++ b/src/Jackett.Common/Indexers/Milkie.cs
@@ -28,8 +28,8 @@ namespace Jackett.Common.Indexers
                    name: "Milkie",
                    description: "Milkie.cc (ME) is private torrent tracker for 0day / general",
                    link: "https://milkie.cc/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -37,6 +37,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/MyAmity.cs b/src/Jackett.Common/Indexers/MyAmity.cs
index 1284c8595..9eb96f5a0 100644
--- a/src/Jackett.Common/Indexers/MyAmity.cs
+++ b/src/Jackett.Common/Indexers/MyAmity.cs
@@ -33,8 +33,8 @@ namespace Jackett.Common.Indexers
                    name: "myAmity",
                    description: "A German general tracker.",
                    link: "https://ttv2.myamity.info/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -42,6 +42,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/MyAnonamouse.cs b/src/Jackett.Common/Indexers/MyAnonamouse.cs
index 4f16b0865..4582cf389 100644
--- a/src/Jackett.Common/Indexers/MyAnonamouse.cs
+++ b/src/Jackett.Common/Indexers/MyAnonamouse.cs
@@ -30,8 +30,13 @@ namespace Jackett.Common.Indexers
                    description: "Friendliness, Warmth and Sharing",
                    link: "https://www.myanonamouse.net/",
                    configService: configService,
-                   // TODO: add book search
-                   caps: new TorznabCapabilities(),
+                   caps: new TorznabCapabilities
+                   {
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
+                       }
+                   },
                    client: c,
                    logger: l,
                    p: ps,
diff --git a/src/Jackett.Common/Indexers/NCore.cs b/src/Jackett.Common/Indexers/NCore.cs
index 12045f9d3..9628f0d0d 100644
--- a/src/Jackett.Common/Indexers/NCore.cs
+++ b/src/Jackett.Common/Indexers/NCore.cs
@@ -48,7 +48,6 @@ namespace Jackett.Common.Indexers
                  link: "https://ncore.cc/",
                  caps: new TorznabCapabilities
                  {
-                     // TODO: add music and book search
                      TvSearchParams = new List<TvSearchParam>
                      {
                          TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -56,6 +55,14 @@ namespace Jackett.Common.Indexers
                      MovieSearchParams = new List<MovieSearchParam>
                      {
                          MovieSearchParam.Q, MovieSearchParam.ImdbId
+                     },
+                     MusicSearchParams = new List<MusicSearchParam>
+                     {
+                         MusicSearchParam.Q
+                     },
+                     BookSearchParams = new List<BookSearchParam>
+                     {
+                         BookSearchParam.Q
                      }
                  },
                  configService: configService,
diff --git a/src/Jackett.Common/Indexers/NewRealWorld.cs b/src/Jackett.Common/Indexers/NewRealWorld.cs
index 3d9aaaab2..9af92fd78 100644
--- a/src/Jackett.Common/Indexers/NewRealWorld.cs
+++ b/src/Jackett.Common/Indexers/NewRealWorld.cs
@@ -34,8 +34,8 @@ namespace Jackett.Common.Indexers
                    name: "New Real World",
                    description: "A German general tracker.",
                    link: "https://nrw-tracker.eu/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -43,6 +43,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/NorBits.cs b/src/Jackett.Common/Indexers/NorBits.cs
index e199b1851..1547e54c5 100644
--- a/src/Jackett.Common/Indexers/NorBits.cs
+++ b/src/Jackett.Common/Indexers/NorBits.cs
@@ -49,7 +49,6 @@ namespace Jackett.Common.Indexers
                    link: "https://norbits.net/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and books search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -57,6 +56,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/NotWhatCD.cs b/src/Jackett.Common/Indexers/NotWhatCD.cs
index 59dd5aade..682833499 100644
--- a/src/Jackett.Common/Indexers/NotWhatCD.cs
+++ b/src/Jackett.Common/Indexers/NotWhatCD.cs
@@ -18,7 +18,6 @@ namespace Jackett.Common.Indexers
                    link: "https://notwhat.cd/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -30,6 +29,10 @@ namespace Jackett.Common.Indexers
                        MusicSearchParams = new List<MusicSearchParam>
                        {
                            MusicSearchParam.Q, MusicSearchParam.Album, MusicSearchParam.Artist, MusicSearchParam.Label, MusicSearchParam.Year
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/Orpheus.cs b/src/Jackett.Common/Indexers/Orpheus.cs
index 56b085410..d738090a8 100644
--- a/src/Jackett.Common/Indexers/Orpheus.cs
+++ b/src/Jackett.Common/Indexers/Orpheus.cs
@@ -18,7 +18,6 @@ namespace Jackett.Common.Indexers
                    link: "https://orpheus.network/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -30,6 +29,10 @@ namespace Jackett.Common.Indexers
                        MusicSearchParams = new List<MusicSearchParam>
                        {
                            MusicSearchParam.Q, MusicSearchParam.Album, MusicSearchParam.Artist, MusicSearchParam.Label, MusicSearchParam.Year
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/Partis.cs b/src/Jackett.Common/Indexers/Partis.cs
index 32ed8faca..c52e258eb 100644
--- a/src/Jackett.Common/Indexers/Partis.cs
+++ b/src/Jackett.Common/Indexers/Partis.cs
@@ -33,8 +33,8 @@ namespace Jackett.Common.Indexers
                    name: "Partis",
                    description: "Partis is a SLOVENIAN Private Torrent Tracker",
                    link: "https://www.partis.si/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -42,6 +42,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/PolishTracker.cs b/src/Jackett.Common/Indexers/PolishTracker.cs
index da30581a7..dcd18f10c 100644
--- a/src/Jackett.Common/Indexers/PolishTracker.cs
+++ b/src/Jackett.Common/Indexers/PolishTracker.cs
@@ -34,7 +34,6 @@ namespace Jackett.Common.Indexers
                    link: "https://pte.nu/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -42,6 +41,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/PreToMe.cs b/src/Jackett.Common/Indexers/PreToMe.cs
index 59d8ab07c..63ef2d35f 100644
--- a/src/Jackett.Common/Indexers/PreToMe.cs
+++ b/src/Jackett.Common/Indexers/PreToMe.cs
@@ -30,7 +30,6 @@ namespace Jackett.Common.Indexers
                    link: "https://pretome.info/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -38,6 +37,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    client: wc,
diff --git a/src/Jackett.Common/Indexers/PrivateHD.cs b/src/Jackett.Common/Indexers/PrivateHD.cs
index acf988388..e3b8e642b 100644
--- a/src/Jackett.Common/Indexers/PrivateHD.cs
+++ b/src/Jackett.Common/Indexers/PrivateHD.cs
@@ -18,7 +18,6 @@ namespace Jackett.Common.Indexers
                    link: "https://privatehd.to/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -26,6 +25,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/PsyTorrents.cs b/src/Jackett.Common/Indexers/PsyTorrents.cs
index 7920fe6c8..bb743ab65 100644
--- a/src/Jackett.Common/Indexers/PsyTorrents.cs
+++ b/src/Jackett.Common/Indexers/PsyTorrents.cs
@@ -17,11 +17,15 @@ namespace Jackett.Common.Indexers
                    name: "Psytorrents",
                    description: "Psytorrents (PSY) is a Private Torrent Tracker for ELECTRONIC MUSIC",
                    link: "https://psytorrents.info/",
-                   caps: new TorznabCapabilities{
-                       // TODO: add music search
+                   caps: new TorznabCapabilities
+                   {
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/RarBG.cs b/src/Jackett.Common/Indexers/RarBG.cs
index bc357e6c6..516e150df 100644
--- a/src/Jackett.Common/Indexers/RarBG.cs
+++ b/src/Jackett.Common/Indexers/RarBG.cs
@@ -37,7 +37,6 @@ namespace Jackett.Common.Indexers
                    link: "https://rarbg.to/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -45,6 +44,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/Redacted.cs b/src/Jackett.Common/Indexers/Redacted.cs
index a3e33775f..68eaae5fa 100644
--- a/src/Jackett.Common/Indexers/Redacted.cs
+++ b/src/Jackett.Common/Indexers/Redacted.cs
@@ -22,7 +22,6 @@ namespace Jackett.Common.Indexers
                    link: "https://redacted.ch/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -34,6 +33,10 @@ namespace Jackett.Common.Indexers
                        MusicSearchParams = new List<MusicSearchParam>
                        {
                            MusicSearchParam.Q, MusicSearchParam.Album, MusicSearchParam.Artist, MusicSearchParam.Label, MusicSearchParam.Year
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/RevolutionTT.cs b/src/Jackett.Common/Indexers/RevolutionTT.cs
index 430b5dae3..df73120cd 100644
--- a/src/Jackett.Common/Indexers/RevolutionTT.cs
+++ b/src/Jackett.Common/Indexers/RevolutionTT.cs
@@ -32,7 +32,6 @@ namespace Jackett.Common.Indexers
                    link: "https://revolutiontt.me/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -40,6 +39,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/RuTracker.cs b/src/Jackett.Common/Indexers/RuTracker.cs
index d8c41f7ba..6bfcbe65a 100644
--- a/src/Jackett.Common/Indexers/RuTracker.cs
+++ b/src/Jackett.Common/Indexers/RuTracker.cs
@@ -39,8 +39,8 @@ namespace Jackett.Common.Indexers
                    name: "RuTracker",
                    description: "RuTracker is a Semi-Private Russian torrent site with a thriving file-sharing community",
                    link: "https://rutracker.org/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -48,6 +48,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/SceneFZ.cs b/src/Jackett.Common/Indexers/SceneFZ.cs
index b2d7b16bb..cce95c724 100644
--- a/src/Jackett.Common/Indexers/SceneFZ.cs
+++ b/src/Jackett.Common/Indexers/SceneFZ.cs
@@ -24,7 +24,6 @@ namespace Jackett.Common.Indexers
                 link: "https://scenefz.me/",
                 caps: new TorznabCapabilities
                 {
-                    // TODO: add music and book search
                     TvSearchParams = new List<TvSearchParam>
                     {
                         TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -32,6 +31,14 @@ namespace Jackett.Common.Indexers
                     MovieSearchParams = new List<MovieSearchParam>
                     {
                         MovieSearchParam.Q, MovieSearchParam.ImdbId
+                    },
+                    MusicSearchParams = new List<MusicSearchParam>
+                    {
+                        MusicSearchParam.Q
+                    },
+                    BookSearchParams = new List<BookSearchParam>
+                    {
+                        BookSearchParam.Q
                     }
                 },
                 configService: configService,
diff --git a/src/Jackett.Common/Indexers/SceneHD.cs b/src/Jackett.Common/Indexers/SceneHD.cs
index 8956fe8d4..dd78848c2 100644
--- a/src/Jackett.Common/Indexers/SceneHD.cs
+++ b/src/Jackett.Common/Indexers/SceneHD.cs
@@ -33,7 +33,6 @@ namespace Jackett.Common.Indexers
                    configService: configService,
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -41,6 +40,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    client: c,
diff --git a/src/Jackett.Common/Indexers/SceneTime.cs b/src/Jackett.Common/Indexers/SceneTime.cs
index a6bf9ac1a..373c603c4 100644
--- a/src/Jackett.Common/Indexers/SceneTime.cs
+++ b/src/Jackett.Common/Indexers/SceneTime.cs
@@ -33,8 +33,8 @@ namespace Jackett.Common.Indexers
                    name: "SceneTime",
                    description: "Always on time",
                    link: "https://www.scenetime.com/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -42,6 +42,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/SolidTorrents.cs b/src/Jackett.Common/Indexers/SolidTorrents.cs
index 97be9394c..bea2150a7 100644
--- a/src/Jackett.Common/Indexers/SolidTorrents.cs
+++ b/src/Jackett.Common/Indexers/SolidTorrents.cs
@@ -40,8 +40,8 @@ namespace Jackett.Common.Indexers
                    name: "Solid Torrents",
                    description: "Solid Torrents is a Public torrent meta-search engine",
                    link: "https://solidtorrents.net/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -49,6 +49,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/SpeedCD.cs b/src/Jackett.Common/Indexers/SpeedCD.cs
index 7c320738f..217f1795c 100644
--- a/src/Jackett.Common/Indexers/SpeedCD.cs
+++ b/src/Jackett.Common/Indexers/SpeedCD.cs
@@ -39,7 +39,6 @@ namespace Jackett.Common.Indexers
                    link: "https://speed.cd/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -47,6 +46,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/SuperBits.cs b/src/Jackett.Common/Indexers/SuperBits.cs
index ed4b67301..e1f26c1ca 100644
--- a/src/Jackett.Common/Indexers/SuperBits.cs
+++ b/src/Jackett.Common/Indexers/SuperBits.cs
@@ -36,7 +36,6 @@ namespace Jackett.Common.Indexers
                    link: "https://superbits.org/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -44,6 +43,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/ThePirateBay.cs b/src/Jackett.Common/Indexers/ThePirateBay.cs
index 86bf11f33..8a27c5f05 100644
--- a/src/Jackett.Common/Indexers/ThePirateBay.cs
+++ b/src/Jackett.Common/Indexers/ThePirateBay.cs
@@ -76,8 +76,8 @@ namespace Jackett.Common.Indexers
                 name: "The Pirate Bay",
                 description: "Pirate Bay (TPB) is the galaxy’s most resilient Public BitTorrent site",
                 link: "https://thepiratebay.org/",
-                caps: new TorznabCapabilities {
-                    // TODO: add music and book search
+                caps: new TorznabCapabilities
+                {
                     TvSearchParams = new List<TvSearchParam>
                     {
                         TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -85,6 +85,14 @@ namespace Jackett.Common.Indexers
                     MovieSearchParams = new List<MovieSearchParam>
                     {
                         MovieSearchParam.Q
+                    },
+                    MusicSearchParams = new List<MusicSearchParam>
+                    {
+                        MusicSearchParam.Q
+                    },
+                    BookSearchParams = new List<BookSearchParam>
+                    {
+                        BookSearchParam.Q
                     }
                 },
                 configService: configService,
diff --git a/src/Jackett.Common/Indexers/Toloka.cs b/src/Jackett.Common/Indexers/Toloka.cs
index db9efa56a..857fc1d95 100644
--- a/src/Jackett.Common/Indexers/Toloka.cs
+++ b/src/Jackett.Common/Indexers/Toloka.cs
@@ -36,8 +36,8 @@ namespace Jackett.Common.Indexers
                    name: "Toloka.to",
                    description: "Toloka is a Semi-Private Ukrainian torrent site with a thriving file-sharing community",
                    link: "https://toloka.to/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -45,6 +45,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/TorrenTech.cs b/src/Jackett.Common/Indexers/TorrenTech.cs
index 0e2327d46..df06c2357 100644
--- a/src/Jackett.Common/Indexers/TorrenTech.cs
+++ b/src/Jackett.Common/Indexers/TorrenTech.cs
@@ -36,8 +36,13 @@ namespace Jackett.Common.Indexers
                    name: "Torrentech",
                    description: "Torrentech (TTH) is a Private Torrent Tracker for ELECTRONIC MUSIC",
                    link: "https://www.torrentech.org/",
-                   // TODO: add music search
-                   caps: new TorznabCapabilities(),
+                   caps: new TorznabCapabilities
+                   {
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       }
+                   },
                    configService: configService,
                    client: wc,
                    logger: l,
diff --git a/src/Jackett.Common/Indexers/TorrentBytes.cs b/src/Jackett.Common/Indexers/TorrentBytes.cs
index 8f79ce2ef..d1cc8e0a0 100644
--- a/src/Jackett.Common/Indexers/TorrentBytes.cs
+++ b/src/Jackett.Common/Indexers/TorrentBytes.cs
@@ -31,7 +31,6 @@ namespace Jackett.Common.Indexers
                    link: "https://www.torrentbytes.net/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -39,6 +38,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/TorrentDay.cs b/src/Jackett.Common/Indexers/TorrentDay.cs
index 20183ed6e..4784d7e49 100644
--- a/src/Jackett.Common/Indexers/TorrentDay.cs
+++ b/src/Jackett.Common/Indexers/TorrentDay.cs
@@ -53,7 +53,6 @@ namespace Jackett.Common.Indexers
                    link: "https://tday.love/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -61,6 +60,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs
index 33cb7a629..01d5b41ba 100644
--- a/src/Jackett.Common/Indexers/TorrentHeaven.cs
+++ b/src/Jackett.Common/Indexers/TorrentHeaven.cs
@@ -25,8 +25,8 @@ namespace Jackett.Common.Indexers
                  name: "TorrentHeaven",
                  description: "A German general tracker.",
                  link: "https://newheaven.nl/",
-                 caps: new TorznabCapabilities {
-                     // TODO: add music and book search
+                 caps: new TorznabCapabilities
+                 {
                      TvSearchParams = new List<TvSearchParam>
                      {
                          TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -34,6 +34,14 @@ namespace Jackett.Common.Indexers
                      MovieSearchParams = new List<MovieSearchParam>
                      {
                          MovieSearchParam.Q
+                     },
+                     MusicSearchParams = new List<MusicSearchParam>
+                     {
+                         MusicSearchParam.Q
+                     },
+                     BookSearchParams = new List<BookSearchParam>
+                     {
+                         BookSearchParam.Q
                      }
                  },
                  configService: configService,
diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs
index 6bb698a10..4c2da86ee 100644
--- a/src/Jackett.Common/Indexers/TorrentLeech.cs
+++ b/src/Jackett.Common/Indexers/TorrentLeech.cs
@@ -37,7 +37,6 @@ namespace Jackett.Common.Indexers
                    link: "https://www.torrentleech.org/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -45,6 +44,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/TorrentNetwork.cs b/src/Jackett.Common/Indexers/TorrentNetwork.cs
index 0355d1217..002c4bf61 100644
--- a/src/Jackett.Common/Indexers/TorrentNetwork.cs
+++ b/src/Jackett.Common/Indexers/TorrentNetwork.cs
@@ -38,8 +38,8 @@ namespace Jackett.Common.Indexers
                    name: "Torrent Network",
                    description: "Torrent Network (TN) is a GERMAN Private site for TV / MOVIES / GENERAL",
                    link: "https://tntracker.org/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -47,6 +47,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/TorrentSeeds.cs b/src/Jackett.Common/Indexers/TorrentSeeds.cs
index 40e5cf15c..dd5c03c3b 100644
--- a/src/Jackett.Common/Indexers/TorrentSeeds.cs
+++ b/src/Jackett.Common/Indexers/TorrentSeeds.cs
@@ -33,7 +33,6 @@ namespace Jackett.Common.Indexers
                  link: "https://torrentseeds.org/",
                  caps: new TorznabCapabilities
                  {
-                     // TODO: add music and book search
                      TvSearchParams = new List<TvSearchParam>
                      {
                          TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -41,6 +40,14 @@ namespace Jackett.Common.Indexers
                      MovieSearchParams = new List<MovieSearchParam>
                      {
                          MovieSearchParam.Q
+                     },
+                     MusicSearchParams = new List<MusicSearchParam>
+                     {
+                         MusicSearchParam.Q
+                     },
+                     BookSearchParams = new List<BookSearchParam>
+                     {
+                         BookSearchParam.Q
                      }
                  },
                  configService: configService,
diff --git a/src/Jackett.Common/Indexers/TorrentSyndikat.cs b/src/Jackett.Common/Indexers/TorrentSyndikat.cs
index b330bfa87..2840c1b18 100644
--- a/src/Jackett.Common/Indexers/TorrentSyndikat.cs
+++ b/src/Jackett.Common/Indexers/TorrentSyndikat.cs
@@ -35,7 +35,6 @@ namespace Jackett.Common.Indexers
                    link: "https://torrent-syndikat.org/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add music and book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -43,6 +42,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs
index c2fdb9641..76a91bca1 100644
--- a/src/Jackett.Common/Indexers/XSpeeds.cs
+++ b/src/Jackett.Common/Indexers/XSpeeds.cs
@@ -36,7 +36,6 @@ namespace Jackett.Common.Indexers
                    link: "https://www.xspeeds.eu/",
                    caps: new TorznabCapabilities
                    {
-                       // TODO: add book search
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -44,6 +43,10 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q, MovieSearchParam.ImdbId
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/Xthor.cs b/src/Jackett.Common/Indexers/Xthor.cs
index 3f4d9e872..e02591001 100644
--- a/src/Jackett.Common/Indexers/Xthor.cs
+++ b/src/Jackett.Common/Indexers/Xthor.cs
@@ -46,8 +46,8 @@ namespace Jackett.Common.Indexers
                    name: "Xthor",
                    description: "General French Private Tracker",
                    link: "https://xthor.tk/",
-                   caps: new TorznabCapabilities {
-                       // TODO: add music and book search
+                   caps: new TorznabCapabilities
+                   {
                        TvSearchParams = new List<TvSearchParam>
                        {
                            TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep
@@ -55,6 +55,14 @@ namespace Jackett.Common.Indexers
                        MovieSearchParams = new List<MovieSearchParam>
                        {
                            MovieSearchParam.Q
+                       },
+                       MusicSearchParams = new List<MusicSearchParam>
+                       {
+                           MusicSearchParam.Q
+                       },
+                       BookSearchParams = new List<BookSearchParam>
+                       {
+                           BookSearchParam.Q
                        }
                    },
                    configService: configService,
diff --git a/src/Jackett.Common/Indexers/XtremeZone.cs b/src/Jackett.Common/Indexers/XtremeZone.cs
index 8a4dda5cc..df6951ef0 100644
--- a/src/Jackett.Common/Indexers/XtremeZone.cs
+++ b/src/Jackett.Common/Indexers/XtremeZone.cs
@@ -24,7 +24,6 @@ namespace Jackett.Common.Indexers
                 link: "https://myxz.eu/",
                 caps: new TorznabCapabilities
                 {
-                    // TODO: add music and ebook search
                     TvSearchParams = new List<TvSearchParam>
                     {
                         TvSearchParam.Q, TvSearchParam.Season, TvSearchParam.Ep, TvSearchParam.ImdbId
@@ -32,6 +31,14 @@ namespace Jackett.Common.Indexers
                     MovieSearchParams = new List<MovieSearchParam>
                     {
                         MovieSearchParam.Q, MovieSearchParam.ImdbId
+                    },
+                    MusicSearchParams = new List<MusicSearchParam>
+                    {
+                        MusicSearchParam.Q
+                    },
+                    BookSearchParams = new List<BookSearchParam>
+                    {
+                        BookSearchParam.Q
                     }
                 },
                 configService: configService,