4 files changed, 23 insertions, 70 deletions

diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
index 5b939244e..c1cc1555d 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -245,25 +245,15 @@ namespace MediaBrowser.Api.UserLibrary
 
             User user = null;
             BaseItem parentItem;
-            List<BaseItem> libraryItems = null;
 
             if (!string.IsNullOrWhiteSpace(request.UserId))
             {
                 user = UserManager.GetUserById(request.UserId);
                 parentItem = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : LibraryManager.GetItemById(request.ParentId);
-
-                if (RequiresLibraryItems(request, dtoOptions))
-                {
-                    libraryItems = user.RootFolder.GetRecursiveChildren(user).ToList();
-                }
             }
             else
             {
                 parentItem = string.IsNullOrEmpty(request.ParentId) ? LibraryManager.RootFolder : LibraryManager.GetItemById(request.ParentId);
-                if (RequiresLibraryItems(request, dtoOptions))
-                {
-                    libraryItems = LibraryManager.RootFolder.GetRecursiveChildren().ToList();
-                }
             }
 
             IEnumerable<BaseItem> items;
@@ -307,8 +297,6 @@ namespace MediaBrowser.Api.UserLibrary
 
             var filteredItems = FilterItems(request, extractedItems, user);
 
-            filteredItems = FilterByLibraryItems(request, filteredItems.Cast<IItemByName>(), user, libraryItems).Cast<BaseItem>();
-
             filteredItems = LibraryManager.Sort(filteredItems, user, request.GetOrderBy(), request.SortOrder ?? SortOrder.Ascending);
 
             var ibnItemsArray = filteredItems.ToList();
@@ -334,15 +322,7 @@ namespace MediaBrowser.Api.UserLibrary
 
             }
 
-            IEnumerable<Tuple<BaseItem, List<BaseItem>>> tuples;
-            if (dtoOptions.Fields.Contains(ItemFields.ItemCounts))
-            {
-                tuples = ibnItems.Select(i => new Tuple<BaseItem, List<BaseItem>>(i, ((IItemByName)i).GetTaggedItems(libraryItems).ToList()));
-            }
-            else
-            {
-                tuples = ibnItems.Select(i => new Tuple<BaseItem, List<BaseItem>>(i, new List<BaseItem>()));
-            }
+            var tuples = ibnItems.Select(i => new Tuple<BaseItem, List<BaseItem>>(i, new List<BaseItem>()));
 
             var syncProgess = DtoService.GetSyncedItemProgress(dtoOptions);
             var dtos = tuples.Select(i => DtoService.GetItemByNameDto(i.Item1, dtoOptions, i.Item2, syncProgess, user));
@@ -352,52 +332,6 @@ namespace MediaBrowser.Api.UserLibrary
             return result;
         }
 
-        private bool RequiresLibraryItems(GetItemsByName request, DtoOptions options)
-        {
-            var filters = request.GetFilters().ToList();
-
-            if (filters.Contains(ItemFilter.IsPlayed))
-            {
-                return true;
-            }
-
-            if (filters.Contains(ItemFilter.IsUnplayed))
-            {
-                return true;
-            }
-
-            if (request.IsPlayed.HasValue)
-            {
-                return true;
-            }
-
-            return options.Fields.Contains(ItemFields.ItemCounts);
-        }
-
-        private IEnumerable<IItemByName> FilterByLibraryItems(GetItemsByName request, IEnumerable<IItemByName> items, User user, IEnumerable<BaseItem> libraryItems)
-        {
-            var filters = request.GetFilters().ToList();
-
-            if (filters.Contains(ItemFilter.IsPlayed))
-            {
-                items = items.Where(i => i.GetTaggedItems(libraryItems).All(l => l.IsPlayed(user)));
-            }
-
-            if (filters.Contains(ItemFilter.IsUnplayed))
-            {
-                items = items.Where(i => i.GetTaggedItems(libraryItems).All(l => l.IsUnplayed(user)));
-            }
-
-            if (request.IsPlayed.HasValue)
-            {
-                var val = request.IsPlayed.Value;
-
-                items = items.Where(i => i.GetTaggedItems(libraryItems).All(l => l.IsPlayed(user)) == val);
-            }
-
-            return items;
-        }
-
         /// <summary>
         /// Filters the items.
         /// </summary>
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
index 0594691a2..1acbce6db 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
@@ -277,6 +277,8 @@ namespace MediaBrowser.Api.UserLibrary
         [ApiMember(Name = "Albums", Description = "Optional. If specified, results will be filtered based on album. This allows multiple, pipe delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
         public string Albums { get; set; }
 
+        public string AlbumIds { get; set; }
+
         /// <summary>
         /// Gets or sets the item ids.
         /// </summary>
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 8300beac3..5d267d059 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Services;
 
@@ -359,15 +360,30 @@ namespace MediaBrowser.Api.UserLibrary
             }
 
             // ExcludeArtistIds
-            if (!string.IsNullOrEmpty(request.ExcludeArtistIds))
+            if (!string.IsNullOrWhiteSpace(request.ExcludeArtistIds))
             {
                 query.ExcludeArtistIds = request.ExcludeArtistIds.Split('|');
             }
 
+            if (!string.IsNullOrWhiteSpace(request.AlbumIds))
+            {
+                query.AlbumIds = request.AlbumIds.Split('|');
+            }
+
             // Albums
             if (!string.IsNullOrEmpty(request.Albums))
             {
-                query.AlbumNames = request.Albums.Split('|');
+                query.AlbumIds = request.Albums.Split('|').Select(i =>
+                {
+                    return _libraryManager.GetItemList(new InternalItemsQuery
+                    {
+                        IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
+                        Name = i,
+                        Limit = 1
+
+                    }).Select(album => album.Id.ToString("N")).FirstOrDefault();
+
+                }).ToArray();
             }
 
             // Studios
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 08aba90d2..32f3a1f00 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -360,7 +360,8 @@ namespace MediaBrowser.Api.UserLibrary
                 var currentUser = user;
 
                 var dtos = series
-                    .GetRecursiveChildren(i => i is Episode && i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
+                    .GetEpisodes(user)
+                    .Where(i => i.ParentIndexNumber.HasValue && i.ParentIndexNumber.Value == 0)
                     .OrderBy(i =>
                     {
                         if (i.PremiereDate.HasValue)