diff --git a/dist/plex-meets-homeassistant.js b/dist/plex-meets-homeassistant.js
index e83cc03..1450540 100644
--- a/dist/plex-meets-homeassistant.js
+++ b/dist/plex-meets-homeassistant.js
@@ -21416,7 +21416,9 @@ class PlexMeetsHomeAssistant extends HTMLElement {
                         }
                         else if (lodash.includes(lodash.toUpper(movieData.title), lodash.toUpper(this.searchValue)) ||
                             lodash.includes(lodash.toUpper(movieData.parentTitle), lodash.toUpper(this.searchValue)) ||
-                            lodash.includes(lodash.toUpper(movieData.grandparentTitle), lodash.toUpper(this.searchValue))) {
+                            lodash.includes(lodash.toUpper(movieData.grandparentTitle), lodash.toUpper(this.searchValue)) ||
+                            lodash.includes(lodash.toUpper(movieData.tag), lodash.toUpper(this.searchValue)) ||
+                            lodash.includes(lodash.toUpper(lodash.get(movieData, 'epg.title')), lodash.toUpper(this.searchValue))) {
                             shouldRender = true;
                         }
                         if (shouldRender) {
diff --git a/src/plex-meets-homeassistant.ts b/src/plex-meets-homeassistant.ts
index 0a39bc0..5d684b9 100644
--- a/src/plex-meets-homeassistant.ts
+++ b/src/plex-meets-homeassistant.ts
@@ -563,7 +563,9 @@ class PlexMeetsHomeAssistant extends HTMLElement {
 					} else if (
 						_.includes(_.toUpper(movieData.title), _.toUpper(this.searchValue)) ||
 						_.includes(_.toUpper(movieData.parentTitle), _.toUpper(this.searchValue)) ||
-						_.includes(_.toUpper(movieData.grandparentTitle), _.toUpper(this.searchValue))
+						_.includes(_.toUpper(movieData.grandparentTitle), _.toUpper(this.searchValue)) ||
+						_.includes(_.toUpper(movieData.tag), _.toUpper(this.searchValue)) ||
+						_.includes(_.toUpper(_.get(movieData, 'epg.title')), _.toUpper(this.searchValue))
 					) {
 						shouldRender = true;
 					}