diff --git a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs
index 58069d0df..27c7b6fc7 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Services/SearchService.cs
@@ -6,17 +6,17 @@ namespace Orchard.Search.Services
 {
     public class SearchService : ISearchService
     {
-        private readonly IIndexProvider _indexProvider;
+        private readonly IIndexManager _indexManager;
 
-        public SearchService(IIndexProvider indexProvider) {
-            _indexProvider = indexProvider;
+        public SearchService(IIndexManager indexManager) {
+            _indexManager = indexManager;
         }
 
         public IEnumerable<ISearchHit> Query(string term) {
-            if (string.IsNullOrWhiteSpace(term))
+            if (string.IsNullOrWhiteSpace(term) || !_indexManager.HasIndexProvider())
                 return Enumerable.Empty<ISearchHit>();
 
-            return _indexProvider.CreateSearchBuilder("search")
+            return _indexManager.GetSearchIndexProvider().CreateSearchBuilder("search")
                 .WithField("title", term)
                 .WithField("body", term)
                 .Search();
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx
index 144a490d8..8811982c1 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.ascx
@@ -9,7 +9,10 @@ using(Html.BeginForm("index", "search", FormMethod.Get, new { @class = "search"
     </fieldset><%
 }
 
+if (!string.IsNullOrWhiteSpace(Model.Term)) { %>
+    <p class="search-summary"><%=T("<em>{0}</em> results", Model.Results.Count()) %></p><%
+}
+
 if (Model.Results.Count() > 0) { %>
-    <p class="search-summary"><%=T("<em>{0}</em> results", Model.Results.Count()) %></p>
     <%=Html.UnorderedList(Model.Results, (r, i) => Html.DisplayForItem(r.Content).ToHtmlString(), "search-results contentItems") %><%
 } %>
\ No newline at end of file