1 files changed, 18 insertions, 19 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 4d9aac6f9..b6983b73e 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -189,21 +189,6 @@ namespace MediaBrowser.Controller.Entities
             return baseResult;
         }
 
-        protected override bool IsAllowTagFilterEnforced()
-        {
-            if (this is ICollectionFolder)
-            {
-                return false;
-            }
-
-            if (this is UserView)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
         /// <summary>
         /// Adds the child.
         /// </summary>
@@ -213,7 +198,7 @@ namespace MediaBrowser.Controller.Entities
         {
             item.SetParent(this);
 
-            if (item.Id.Equals(Guid.Empty))
+            if (item.Id.Equals(default))
             {
                 item.Id = LibraryManager.GetNewItemId(item.Path, item.GetType());
             }
@@ -730,7 +715,9 @@ namespace MediaBrowser.Controller.Entities
                 return PostFilterAndSort(items, query, true);
             }
 
-            if (this is not UserRootFolder && this is not AggregateFolder && query.ParentId == Guid.Empty)
+            if (this is not UserRootFolder
+                && this is not AggregateFolder
+                && query.ParentId.Equals(default))
             {
                 query.Parent = this;
             }
@@ -848,6 +835,18 @@ namespace MediaBrowser.Controller.Entities
                 return true;
             }
 
+            if (query.HasThemeSong.HasValue)
+            {
+                Logger.LogDebug("Query requires post-filtering due to HasThemeSong");
+                return true;
+            }
+
+            if (query.HasThemeVideo.HasValue)
+            {
+                Logger.LogDebug("Query requires post-filtering due to HasThemeVideo");
+                return true;
+            }
+
             // Filter by VideoType
             if (query.VideoTypes.Length > 0)
             {
@@ -1492,7 +1491,7 @@ namespace MediaBrowser.Controller.Entities
             {
                 if (i.ItemId.HasValue)
                 {
-                    if (i.ItemId.Value == itemId)
+                    if (i.ItemId.Value.Equals(itemId))
                     {
                         return true;
                     }
@@ -1502,7 +1501,7 @@ namespace MediaBrowser.Controller.Entities
 
                 var child = GetLinkedChild(i);
 
-                if (child != null && child.Id == itemId)
+                if (child != null && child.Id.Equals(itemId))
                 {
                     return true;
                 }