diff --git a/src/app.config.json b/src/app.config.json
index 6db201ac8..111986f78 100644
--- a/src/app.config.json
+++ b/src/app.config.json
@@ -8,19 +8,10 @@
     "languagePicker": false,
     "pagination": {
         "size": 25,
-        "supportedPageSizes": [
-            25,
-            50,
-            100
-        ]
+        "supportedPageSizes": [25, 50, 100]
     },
     "files": {
-        "excluded": [
-            ".DS_Store",
-            "desktop.ini",
-            "thumbs.db",
-            ".git"
-        ]
+        "excluded": [".DS_Store", "desktop.ini", "thumbs.db", ".git"]
     },
     "adf-version-manager": {
         "allowComments": true,
@@ -162,10 +153,8 @@
         }
     },
     "search": {
-        "limits": {
-            "permissionEvaluationTime": null,
-            "permissionEvaluationCount": null
-        },
+        "include": ["path", "allowableOperations"],
+        "fields": [],
         "filterQueries": [
             { "query": "TYPE:'cm:folder' OR TYPE:'cm:content'" },
             { "query": "NOT cm:creator:System" }
@@ -176,39 +165,45 @@
                 { "field": "content.size", "mincount": 1, "label": "Size" },
                 { "field": "creator", "mincount": 1, "label": "Creator" },
                 { "field": "modifier", "mincount": 1, "label": "Modifier" }
-          ]
+            ]
         },
         "facetQueries": [
             { "query": "created:2018", "label": "Created This Year" },
             { "query": "content.mimetype", "label": "Type" },
-            { "query": "content.size:[0 TO 10240]", "label": "Size: xtra small"},
-            { "query": "content.size:[10240 TO 102400]", "label": "Size: small"},
-            { "query": "content.size:[102400 TO 1048576]", "label": "Size: medium" },
-            { "query": "content.size:[1048576 TO 16777216]", "label": "Size: large" },
-            { "query": "content.size:[16777216 TO 134217728]", "label": "Size: xtra large" },
-            { "query": "content.size:[134217728 TO MAX]", "label": "Size: XX large" }
+            {
+                "query": "content.size:[0 TO 10240]",
+                "label": "Size: xtra small"
+            },
+            {
+                "query": "content.size:[10240 TO 102400]",
+                "label": "Size: small"
+            },
+            {
+                "query": "content.size:[102400 TO 1048576]",
+                "label": "Size: medium"
+            },
+            {
+                "query": "content.size:[1048576 TO 16777216]",
+                "label": "Size: large"
+            },
+            {
+                "query": "content.size:[16777216 TO 134217728]",
+                "label": "Size: xtra large"
+            },
+            {
+                "query": "content.size:[134217728 TO MAX]",
+                "label": "Size: XX large"
+            }
         ],
         "query": {
             "categories": [
-                {
-                    "id": "broken",
-                    "name": "Broken Facet",
-                    "enabled": false,
-                    "expanded": false,
-                    "component": {
-                        "selector": "adf-search-text",
-                        "settings": {
-                            "field": "fieldname"
-                        }
-                    }
-                },
                 {
                     "id": "queryName",
                     "name": "Name",
                     "enabled": true,
                     "expanded": true,
                     "component": {
-                        "selector": "adf-search-text",
+                        "selector": "text",
                         "settings": {
                             "pattern": "cm:name:'(.*?)'",
                             "field": "cm:name",
@@ -217,20 +212,28 @@
                     }
                 },
                 {
-                    "id": "queryFields",
-                    "name": "Fields",
+                    "id": "contentSize",
+                    "name": "Content Size",
                     "enabled": true,
-                    "expanded": false,
                     "component": {
-                        "selector": "adf-search-fields",
+                        "selector": "slider",
                         "settings": {
-                            "field": null,
-                            "options": [
-                                { "name": "Name", "value": "name", "fields": ["name"], "default": true },
-                                { "name": "File Size", "value": "content.sizeInBytes", "fields": ["content"], "default": true },
-                                { "name": "Modified On", "value": "modifiedAt", "fields": ["modifiedAt"], "default": true },
-                                { "name": "Modified By", "value": "modifiedByUser.displayName", "fields": ["modifiedByUser"], "default": true }
-                            ]
+                            "field": "cm:content.size",
+                            "min": 0,
+                            "max": 18,
+                            "step": 1,
+                            "thumbLabel": true
+                        }
+                    }
+                },
+                {
+                    "id": "contentSizeRange",
+                    "name": "Content Size (range)",
+                    "enabled": true,
+                    "component": {
+                        "selector": "number-range",
+                        "settings": {
+                            "field": "cm:content.size"
                         }
                     }
                 },
@@ -238,34 +241,29 @@
                     "id": "queryType",
                     "name": "Type",
                     "enabled": true,
-                    "expanded": false,
                     "component": {
-                        "selector": "adf-search-radio",
-                        "settings": {
-                            "field": null,
-                                "options": [
-                                { "name": "None", "value": "", "default": true },
-                                { "name": "All", "value": "TYPE:'cm:folder' OR TYPE:'cm:content'" },
-                                { "name": "Folder", "value": "TYPE:'cm:folder'" },
-                                { "name": "Document", "value": "TYPE:'cm:content'" }
-                            ]
-                        }
-                    }
-                },
-                {
-                    "id": "queryLocations",
-                    "name": "Locations",
-                    "enabled": true,
-                    "expanded": false,
-                    "component": {
-                        "selector": "adf-search-scope-locations",
+                        "selector": "radio",
                         "settings": {
                             "field": null,
                             "options": [
-                                { "name": "Default", "value": "nodes", "default": true },
-                                { "name": "Nodes", "value": "nodes" },
-                                { "name": "Deleted Nodes", "value": "deleted-nodes" },
-                                { "name": "Versions", "value": "versions" }
+                                {
+                                    "name": "None",
+                                    "value": "",
+                                    "default": true
+                                },
+                                {
+                                    "name": "All",
+                                    "value":
+                                        "TYPE:'cm:folder' OR TYPE:'cm:content'"
+                                },
+                                {
+                                    "name": "Folder",
+                                    "value": "TYPE:'cm:folder'"
+                                },
+                                {
+                                    "name": "Document",
+                                    "value": "TYPE:'cm:content'"
+                                }
                             ]
                         }
                     }