diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index f3d7e30a..d646dd41 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -10848,7 +10848,7 @@ SET @sqlSpace = '
 		SI.ItemID as ItemID,
 		SI.ItemName as TextSearch,
 		STYPE.DisplayName as ColumnType,
-		SI.ItemName as FullType,
+		STYPE.DisplayName as FullType,
 		SI.PackageID as PackageID
 	FROM @ItemsService AS I
 	INNER JOIN ServiceItems AS SI ON I.ItemID = SI.ItemID
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
index fe3592d0..5116835c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
@@ -16,6 +16,14 @@ namespace WebsitePanel.WebPortal
             String filterValue = context.Request.Params["term"];
             String fullType = context.Request.Params["fullType"];
             String columnType = context.Request.Params["columnType"];
+            String numResults = context.Request.Params["itemCount"];
+            int iNumResults = 15;
+            if ((numResults != null) && (numResults.Length > 0))
+            {
+                int num = Int32.Parse(numResults);
+                if (num > 0)
+                    iNumResults = num;
+            }
 
             if (fullType == "Spaces")
             {
@@ -23,7 +31,7 @@ namespace WebsitePanel.WebPortal
                 int itemType = Int32.Parse(strItemType);
                 DataSet dsObjectItems = ES.Services.Packages.SearchServiceItemsPaged(PanelSecurity.EffectiveUserId, itemType,
                     String.Format("%{0}%", filterValue),
-                   "",0, 100);
+                   "", 0, iNumResults);
                 DataTable dt = dsObjectItems.Tables[1];
                 List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
                 for (int i = 0; i < dt.Rows.Count; ++i)
@@ -47,22 +55,19 @@ namespace WebsitePanel.WebPortal
             {
                 DataSet dsObjectItems = ES.Services.Packages.GetSearchObject(PanelSecurity.EffectiveUserId, null,
                     String.Format("%{0}%", filterValue),
-                   0, 0, "", 0, 100, columnType,fullType);
+                   0, 0, "", 0, iNumResults, columnType, fullType);
                 DataTable dt = dsObjectItems.Tables[2];
                 List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
                 for (int i = 0; i < dt.Rows.Count; ++i)
                 {
                     DataRow row = dt.Rows[i];
-                    if ((fullType == null) || (fullType.Length == 0) || (fullType == row["FullType"].ToString()))
-                    {
-                        Dictionary<string, string> obj = new Dictionary<string, string>();
-                        obj["ColumnType"] = row["ColumnType"].ToString();
-                        obj["TextSearch"] = row["TextSearch"].ToString();
-                        obj["ItemID"] = row["ItemID"].ToString();
-                        obj["PackageID"] = row["PackageID"].ToString();
-                        obj["FullType"] = row["FullType"].ToString();
-                        dataList.Add(obj);
-                    }
+                    Dictionary<string, string> obj = new Dictionary<string, string>();
+                    obj["ColumnType"] = row["ColumnType"].ToString();
+                    obj["TextSearch"] = row["TextSearch"].ToString();
+                    obj["ItemID"] = row["ItemID"].ToString();
+                    obj["PackageID"] = row["PackageID"].ToString();
+                    obj["FullType"] = row["FullType"].ToString();
+                    dataList.Add(obj);
                 }
 
                 var jsonSerialiser = new JavaScriptSerializer();