diff --git a/foreign dlls/Examine.dll b/foreign dlls/Examine.dll
index eaf05c5cc3..0068435416 100644
Binary files a/foreign dlls/Examine.dll and b/foreign dlls/Examine.dll differ
diff --git a/foreign dlls/UmbracoExamine.dll b/foreign dlls/UmbracoExamine.dll
index 81aa1cb60e..d896cbac88 100644
Binary files a/foreign dlls/UmbracoExamine.dll and b/foreign dlls/UmbracoExamine.dll differ
diff --git a/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs b/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs
index 39529118d3..e7fd31f240 100644
--- a/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs
+++ b/umbraco/presentation/umbraco/Search/QuickSearchHandler.ashx.cs
@@ -44,7 +44,7 @@ namespace umbraco.presentation.umbraco.Search
 
             //if it doesn't start with "*", then search only nodeName and nodeId
             var internalSearcher = UmbracoContext.Current.InternalSearchProvider;
-            var criteria = internalSearcher.CreateSearchCriteria(100, indexType);
+            var criteria = internalSearcher.CreateSearchCriteria(indexType);
             IEnumerable<SearchResult> results;
             if (txt.StartsWith("*"))
             {
@@ -62,7 +62,7 @@ namespace umbraco.presentation.umbraco.Search
             }
 
             JavaScriptSerializer js = new JavaScriptSerializer();
-            context.Response.Write(js.Serialize(results));
+            context.Response.Write(js.Serialize(results.Take(100)));
         }
 
         public static void Authorize()
diff --git a/umbraco/presentation/umbraco/dialogs/search.aspx.cs b/umbraco/presentation/umbraco/dialogs/search.aspx.cs
index 418285e54f..c5ff374504 100644
--- a/umbraco/presentation/umbraco/dialogs/search.aspx.cs
+++ b/umbraco/presentation/umbraco/dialogs/search.aspx.cs
@@ -6,7 +6,7 @@ using System.Web.UI.WebControls;
 using UmbracoExamine;
 using System.Xml;
 using Examine;
-
+using System.Linq;
 
 
 namespace umbraco.presentation.dialogs
@@ -46,7 +46,7 @@ namespace umbraco.presentation.dialogs
 
             //if it doesn't start with "*", then search only nodeName and nodeId
             var internalSearcher = UmbracoContext.Current.InternalSearchProvider;
-            var criteria = internalSearcher.CreateSearchCriteria(100, indexType);
+            var criteria = internalSearcher.CreateSearchCriteria(indexType);
             IEnumerable<SearchResult> results;
             if (query.StartsWith("*"))
             {
@@ -60,7 +60,7 @@ namespace umbraco.presentation.dialogs
                     operation.Or().Id(UmbracoContext.Current.UmbracoUser.StartNodeId);
                 }
 
-                results = internalSearcher.Search(operation.Compile());
+                results = internalSearcher.Search(operation.Compile()).Take(100);
             }
 
             searchResult.XPathNavigator = ResultsAsXml(results).CreateNavigator();
diff --git a/umbraco/presentation/umbraco/webService.asmx.cs b/umbraco/presentation/umbraco/webService.asmx.cs
index 6e388d3935..aab55715a5 100644
--- a/umbraco/presentation/umbraco/webService.asmx.cs
+++ b/umbraco/presentation/umbraco/webService.asmx.cs
@@ -10,7 +10,7 @@ using UmbracoExamine;
 using System.Collections.Generic;
 using Examine;
 using umbraco.presentation;
-
+using System.Linq;
 
 namespace umbraco
 {
@@ -140,7 +140,7 @@ namespace umbraco
             {
                 //if the query starts with "*" then query all fields
                 var internalSearcher = UmbracoContext.Current.InternalSearchProvider;
-                var criteria = internalSearcher.CreateSearchCriteria(20, IndexType.Content);
+                var criteria = internalSearcher.CreateSearchCriteria(IndexType.Content);
                 IEnumerable<SearchResult> results;
                 if (Query.StartsWith("*"))
                 {
@@ -154,7 +154,7 @@ namespace umbraco
                         operation.Or().Id(StartNodeId);
                     }
 
-                    results = internalSearcher.Search(operation.Compile());
+                    results = internalSearcher.Search(operation.Compile()).Take(20);
                 }
                 
                 //var criteria = new SearchCriteria(Query