fixes

Emby.Server.Implementations/Collections/CollectionManager.cs

@@ -341,12 +341,7 @@ namespace Emby.Server.Implementations.Collections
 
                         itemIsInBoxSet = true;
 
-                        if (results.ContainsKey(boxSet.Id))
+                        results.TryAdd(boxSet.Id, boxSet);
-                        {
-                            continue;
-                        }
-
-                        results[boxSet.Id] = boxSet;
                     }
 
                     // skip any item that is in a box set
@@ -373,7 +368,7 @@ namespace Emby.Server.Implementations.Collections
 
                     if (!alreadyInResults)
                     {
-                        results[item.Id] = item;
+                        results[itemId] = item;
                     }
                 }
             }

MediaBrowser.Controller/Entities/Folder.cs

@@ -1436,7 +1436,12 @@ namespace MediaBrowser.Controller.Entities
             {
                 if (i.ItemId.HasValue)
                 {
-                    return i.ItemId.Value == itemId;
+                    if (i.ItemId.Value == itemId)
+                    {
+                        return true;
+                    }
+
+                    continue;
                 }
 
                 var child = GetLinkedChild(i);