diff --git a/ErsatzTV.Infrastructure/Search/LuceneSearchIndex.cs b/ErsatzTV.Infrastructure/Search/LuceneSearchIndex.cs
index 2ed2cb84b..4382101ab 100644
--- a/ErsatzTV.Infrastructure/Search/LuceneSearchIndex.cs
+++ b/ErsatzTV.Infrastructure/Search/LuceneSearchIndex.cs
@@ -1377,8 +1377,11 @@ public sealed class LuceneSearchIndex : ISearchIndex
         using var analyzer = new SimpleAnalyzer(AppLuceneVersion);
         var customAnalyzers = new Dictionary<string, Analyzer>
         {
-            { ShowContentRatingField, new KeywordAnalyzer() },
+            { TypeField, new KeywordAnalyzer() },
+            { TagField, new KeywordAnalyzer() },
+            { ShowTagField, new KeywordAnalyzer() },
             { ContentRatingField, new KeywordAnalyzer() },
+            { ShowContentRatingField, new KeywordAnalyzer() },
             { StateField, new KeywordAnalyzer() },
             { PlotField, new StandardAnalyzer(AppLuceneVersion) }
         };