3 files changed, 2 insertions, 29 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index d0f2e9dfa..34f52aac5 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -472,6 +472,7 @@ namespace MediaBrowser.Controller.Entities
                         }
                         else
                         {
+                            newItems.Add(child);
                             validChildren.Add(child);
                         }
                     }
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index 4b29f49d8..7674dc1d3 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -61,7 +61,6 @@ namespace MediaBrowser.Controller.Entities
         {
             var standaloneTypes = new List<string>
             {
-                CollectionType.AdultVideos,
                 CollectionType.Books,
                 CollectionType.HomeVideos,
                 CollectionType.Photos,
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index f2484aab8..1c59b8bfb 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -337,34 +337,7 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>IEnumerable{Video}.</returns>
         private IEnumerable<Video> LoadAdditionalParts(IEnumerable<FileSystemInfo> fileSystemChildren, IDirectoryService directoryService)
         {
-            IEnumerable<FileSystemInfo> files;
-
-            var path = Path;
-
-            if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd)
-            {
-                files = fileSystemChildren.Where(i =>
-                {
-                    if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
-                    {
-                        return !string.Equals(i.FullName, path, StringComparison.OrdinalIgnoreCase) && LibraryManager.IsMultiPartFolder(i.FullName);
-                    }
-
-                    return false;
-                });
-            }
-            else
-            {
-                files = fileSystemChildren.Where(i =>
-                {
-                    if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
-                    {
-                        return false;
-                    }
-
-                    return !string.Equals(i.FullName, path, StringComparison.OrdinalIgnoreCase) && LibraryManager.IsVideoFile(i.FullName) && LibraryManager.IsMultiPartFile(i.Name);
-                });
-            }
+            var files = LibraryManager.GetAdditionalParts(Path, VideoType, fileSystemChildren);
 
             return LibraryManager.ResolvePaths<Video>(files, directoryService, null).Select(video =>
             {