diff --git a/platform/features/search/src/controllers/SearchController.js b/platform/features/search/src/controllers/SearchController.js
index 1cb3909243..f24cce58f2 100644
--- a/platform/features/search/src/controllers/SearchController.js
+++ b/platform/features/search/src/controllers/SearchController.js
@@ -29,7 +29,7 @@ define(function () {
     
     
     function SearchController($scope, searchService, objectService) {
-        $scope.pageLength = 4;
+        $scope.pageLength = 16;
         
         function page(start, howMany) {
             if (!howMany) {
diff --git a/platform/features/search/src/providers/EverythingSearchProvider.js b/platform/features/search/src/providers/EverythingSearchProvider.js
index ef8e1bb679..93194a2c88 100644
--- a/platform/features/search/src/providers/EverythingSearchProvider.js
+++ b/platform/features/search/src/providers/EverythingSearchProvider.js
@@ -97,20 +97,33 @@ define(
                 return score;
             }
             
+            // Determines if this item can be a valid result for this search term
+            function validResult(item, term) {
+                var itemModel = item.object.getModel(),
+                    itemName = itemModel.name.toLocaleLowerCase(),
+                    itemType = itemModel.type.toLocaleLowerCase();
+                
+                return itemName.includes(term) || itemType.includes(term);
+            }
+            
+            // Determines if this item is a valid type for a search result
+            function validType(item) {
+                var itemModel = item.object.getModel();
+                
+                // Only folders are disallowed
+                return itemModel.type !== "folder";
+            }
+            
             // Filter through a list of searchResults based on a search term 
             function filterResults(results, term, resultsLength) {
                 var searchResults = [],
-                    itemModel,
-                    itemName;
+                    itemModel;
                 
                 for (var i = 0; i < resultsLength; i += 1) {
                     // Prevent errors from getModel not being defined
                     if (results[i].object.getModel) {
-                        itemModel = results[i].object.getModel();
-                        itemName = itemModel.name.toLocaleLowerCase();
-
-                        // Include any matching items, except folders 
-                        if (itemName.includes(term) && itemModel.type !== "folder") {
+                        // Include any items that match the term and are of valid type
+                        if (validResult(results[i], term) && validType(results[i])) {
                             // Score the result
                             score(results[i], term);
                             // Add the result to the result list