Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 7 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index 0cfa524eb..05dde5b3e 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -256,10 +256,15 @@ namespace MediaBrowser.Server.Implementations.Library
 
             if (query.IncludePeople)
             {
+                var itemIds = items.Select(i => i.Id).ToList();
+
                 // Find persons
-                var persons = items.SelectMany(i => _libraryManager.GetPeople(i))
+                var persons = _libraryManager.GetPeople(new InternalPeopleQuery
+                {
+                    NameContains = searchTerm
+                })
+                    .Where(i => itemIds.Contains(i.ItemId))
                     .Select(i => i.Name)
-                    .Where(i => !string.IsNullOrWhiteSpace(i))
                     .Distinct(StringComparer.OrdinalIgnoreCase)
                     .ToList();