Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 18 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index 4deab67f2..372e4addf 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -34,8 +34,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
                 {
                     var collectionType = args.GetCollectionType();
 
-                    if (string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase) ||
-                        string.IsNullOrWhiteSpace(collectionType))
+                    var isStandalone = args.Parent == null;
+
+                    if (isStandalone ||
+                        string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
                     {
                         return new Controller.Entities.Audio.Audio();
                     }
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index f48a4430f..4c65fad68 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -31,9 +31,21 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public async Task<QueryResult<SearchHintInfo>> GetSearchHints(SearchQuery query)
         {
-            var user = _userManager.GetUserById(new Guid(query.UserId));
+            IEnumerable<BaseItem> inputItems;
 
-            var inputItems = user.RootFolder.GetRecursiveChildren(user, null).Where(i => !(i is ICollectionFolder));
+            if (string.IsNullOrEmpty(query.UserId))
+            {
+                inputItems = _libraryManager.RootFolder.RecursiveChildren;
+            }
+            else
+            {
+                var user = _userManager.GetUserById(new Guid(query.UserId));
+
+                inputItems = user.RootFolder.GetRecursiveChildren(user, null);
+            }
+
+
+            inputItems = inputItems.Where(i => !(i is ICollectionFolder));
 
             inputItems = _libraryManager.ReplaceVideosWithPrimaryVersions(inputItems);