diff --git a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs
index 79ca1f5548..d5675578d1 100644
--- a/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/LuceneSearchEngine.cs
@@ -118,9 +118,11 @@ namespace MediaBrowser.Server.Implementations.Library
                 }
             }
 
+            // Find artists
             var artists = items.OfType<Audio>()
                 .SelectMany(i => new[] { i.Artist, i.AlbumArtist })
                 .Where(i => !string.IsNullOrEmpty(i))
+                .Distinct(StringComparer.OrdinalIgnoreCase)
                 .ToList();
 
             foreach (var item in artists)
@@ -193,26 +195,6 @@ namespace MediaBrowser.Server.Implementations.Library
             return hints.OrderBy(i => i.Item2).Select(i => i.Item1);
         }
 
-        /// <summary>
-        /// Gets the hints.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="searchTerm">The search term.</param>
-        /// <returns>IEnumerable{Tuple{SearchHintResultSystem.Int32}}.</returns>
-        private async Task<IEnumerable<Tuple<BaseItem, int>>> GetHints(BaseItem item, string searchTerm)
-        {
-            var hints = new List<Tuple<BaseItem, int>>();
-
-            var index = IndexOf(item.Name, searchTerm);
-
-            if (index != -1)
-            {
-                hints.Add(new Tuple<BaseItem, int>(item, index));
-            }
-
-            return hints;
-        }
-
         /// <summary>
         /// Gets the words.
         /// </summary>
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index df3e78e719..7aaa4d1735 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -485,6 +485,7 @@ namespace MediaBrowser.WebDashboard.Api
                                       "pluginupdatespage.js",
                                       "scheduledtaskpage.js",
                                       "scheduledtaskspage.js",
+                                      "search.js",
                                       "songs.js",
                                       "supporterkeypage.js",
                                       "supporterpage.js",
@@ -528,6 +529,7 @@ namespace MediaBrowser.WebDashboard.Api
                                       "librarybrowser.css",
                                       "detailtable.css",
                                       "posteritem.css",
+                                      "search.css",
                                       "pluginupdates.css",
                                       "userimage.css"
                                   };
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 59f669f779..e0e4f8c9c9 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -186,6 +186,9 @@
     <Content Include="dashboard-ui\css\posteritem.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\css\search.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\css\userimage.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -255,6 +258,9 @@
     <Content Include="dashboard-ui\scripts\musicrecommended.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\search.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\songs.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>