diff --git a/e2e/suites/actions/toolbar-single-selection.test.ts b/e2e/suites/actions/toolbar-single-selection.test.ts
index 0ae7ad4f7..5c9dc25ae 100755
--- a/e2e/suites/actions/toolbar-single-selection.test.ts
+++ b/e2e/suites/actions/toolbar-single-selection.test.ts
@@ -184,7 +184,7 @@ describe('Toolbar actions - single selection : ', () => {
                         .then(() => browser.actions().mouseMove(browser.$('body'), { x: 0, y: 0 }).click().perform());
                 });
 
-                it('on Shared Files', () => {
+                xit('on Shared Files', () => {
                     page.sidenav.navigateToLinkByLabel(SIDEBAR_LABELS.SHARED_FILES)
                         .then(() => dataTable.waitForHeader())
                         .then(() => dataTable.clickOnItemName(file1))
diff --git a/package-lock.json b/package-lock.json
index b5c4353bb..951991325 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,11 +5,11 @@
   "requires": true,
   "dependencies": {
     "@alfresco/adf-content-services": {
-      "version": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d.tgz",
-      "integrity": "sha512-EHYvODiv3w12jbPCZacFSQ2fhwx5FVdmidsU+3ngWWXELjXuWIFhUWv02nEw3BBDO0xA/UkC2D4ASN0GVNNlyA==",
+      "version": "2.4.0-d8e623531b7e75a39e773d32ac6d710354ca6d46",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-d8e623531b7e75a39e773d32ac6d710354ca6d46.tgz",
+      "integrity": "sha512-ge3RMlfrt+U1GEt5sksxKP3RLdZ1JjMguE8HsQk8l0Nq/DXRRkpLMJd0g2+AOZ0BpmtlCmZYHlmVJ9u39cLfBw==",
       "requires": {
-        "@alfresco/adf-core": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d",
+        "@alfresco/adf-core": "2.4.0-d8e623531b7e75a39e773d32ac6d710354ca6d46",
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
         "@angular/common": "5.1.1",
@@ -40,15 +40,6 @@
         "zone.js": "0.8.14"
       },
       "dependencies": {
-        "alfresco-js-api": {
-          "version": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de",
-          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de.tgz",
-          "integrity": "sha512-8d9H4fY7rxPoSpDa42EqI9D0lg1AOQOnkP+0Qz1jkS7w/otsOcCT29jlo5Y1avwscS+QNrwo+RMTaVdGnxwqAA==",
-          "requires": {
-            "event-emitter": "0.3.4",
-            "superagent": "3.8.2"
-          }
-        },
         "core-js": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
@@ -70,9 +61,9 @@
       }
     },
     "@alfresco/adf-core": {
-      "version": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d.tgz",
-      "integrity": "sha512-cvu/PPHcXW0v9dPJ3EMGmEqIJLH+RkwkkvVWpz3v0Zck0y9KRuXkqxOIOoUJwm1AAwPdbyKxDcKFNxpXZ+EdoQ==",
+      "version": "2.4.0-d8e623531b7e75a39e773d32ac6d710354ca6d46",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-d8e623531b7e75a39e773d32ac6d710354ca6d46.tgz",
+      "integrity": "sha512-iNUd6jvRJssQzYXmB2y+sKaXTDk6miu3u6IZYOgLoZxqbsn91msyMLHDMmVEN0EEnHAVREBspAxvi2wEvZ4Lvw==",
       "requires": {
         "@angular/animations": "5.1.1",
         "@angular/cdk": "5.0.1",
@@ -104,15 +95,6 @@
         "zone.js": "0.8.14"
       },
       "dependencies": {
-        "alfresco-js-api": {
-          "version": "2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de",
-          "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-6aeb75354b9b0ddb74444bfb449549ec21c123de.tgz",
-          "integrity": "sha512-8d9H4fY7rxPoSpDa42EqI9D0lg1AOQOnkP+0Qz1jkS7w/otsOcCT29jlo5Y1avwscS+QNrwo+RMTaVdGnxwqAA==",
-          "requires": {
-            "event-emitter": "0.3.4",
-            "superagent": "3.8.2"
-          }
-        },
         "core-js": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
diff --git a/package.json b/package.json
index 5b57b0b4a..337b83f09 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,8 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d",
-    "@alfresco/adf-core": "2.4.0-b18b041ade818cb8afe681649c1ac1293f6e860d",
+    "@alfresco/adf-content-services": "2.4.0-d8e623531b7e75a39e773d32ac6d710354ca6d46",
+    "@alfresco/adf-core": "2.4.0-d8e623531b7e75a39e773d32ac6d710354ca6d46",
     "@angular/animations": "5.1.1",
     "@angular/cdk": "5.0.1",
     "@angular/common": "5.1.1",
diff --git a/src/app.config.json b/src/app.config.json
index 111986f78..0378eb081 100644
--- a/src/app.config.json
+++ b/src/app.config.json
@@ -154,19 +154,17 @@
     },
     "search": {
         "include": ["path", "allowableOperations"],
-        "fields": [],
         "filterQueries": [
             { "query": "TYPE:'cm:folder' OR TYPE:'cm:content'" },
             { "query": "NOT cm:creator:System" }
         ],
-        "facetFields": {
-            "facets": [
-                { "field": "content.mimetype", "mincount": 1, "label": "Type" },
-                { "field": "content.size", "mincount": 1, "label": "Size" },
-                { "field": "creator", "mincount": 1, "label": "Creator" },
-                { "field": "modifier", "mincount": 1, "label": "Modifier" }
-            ]
-        },
+        "facetFields": [
+            { "field": "content.mimetype", "mincount": 1, "label": "Type" },
+            { "field": "content.size", "mincount": 1, "label": "Size" },
+            { "field": "creator", "mincount": 1, "label": "Creator" },
+            { "field": "modifier", "mincount": 1, "label": "Modifier" },
+            { "field": "created", "mincount": 1, "label": "Created" }
+        ],
         "facetQueries": [
             { "query": "created:2018", "label": "Created This Year" },
             { "query": "content.mimetype", "label": "Type" },
@@ -195,80 +193,93 @@
                 "label": "Size: XX large"
             }
         ],
-        "query": {
-            "categories": [
-                {
-                    "id": "queryName",
-                    "name": "Name",
-                    "enabled": true,
-                    "expanded": true,
-                    "component": {
-                        "selector": "text",
-                        "settings": {
-                            "pattern": "cm:name:'(.*?)'",
-                            "field": "cm:name",
-                            "placeholder": "Enter the name"
-                        }
-                    }
-                },
-                {
-                    "id": "contentSize",
-                    "name": "Content Size",
-                    "enabled": true,
-                    "component": {
-                        "selector": "slider",
-                        "settings": {
-                            "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"
-                        }
-                    }
-                },
-                {
-                    "id": "queryType",
-                    "name": "Type",
-                    "enabled": true,
-                    "component": {
-                        "selector": "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'"
-                                }
-                            ]
-                        }
+        "categories": [
+            {
+                "id": "queryName",
+                "name": "Name",
+                "enabled": true,
+                "expanded": true,
+                "component": {
+                    "selector": "text",
+                    "settings": {
+                        "pattern": "cm:name:'(.*?)'",
+                        "field": "cm:name",
+                        "placeholder": "Enter the name"
                     }
                 }
-            ]
-        }
+            },
+            {
+                "id": "checkList",
+                "name": "Check List",
+                "enabled": true,
+                "component": {
+                    "selector": "check-list",
+                    "settings": {
+                        "operator": "OR",
+                        "options": [
+                            { "name": "Folder", "value": "TYPE:'cm:folder'" },
+                            { "name": "Document", "value": "TYPE:'cm:content'" }
+                        ]
+                    }
+                }
+            },
+            {
+                "id": "contentSize",
+                "name": "Content Size",
+                "enabled": true,
+                "component": {
+                    "selector": "slider",
+                    "settings": {
+                        "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"
+                    }
+                }
+            },
+            {
+                "id": "createdDateRange",
+                "name": "Created Date (range)",
+                "enabled": true,
+                "component": {
+                    "selector": "date-range",
+                    "settings": {
+                        "field": "cm:created"
+                    }
+                }
+            },
+            {
+                "id": "queryType",
+                "name": "Type",
+                "enabled": true,
+                "component": {
+                    "selector": "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'" }
+                        ]
+                    }
+                }
+            }
+        ]
     }
 }
diff --git a/src/app/components/search/search.component.html b/src/app/components/search/search.component.html
index 18aa4ac04..a132eba67 100644
--- a/src/app/components/search/search.component.html
+++ b/src/app/components/search/search.component.html
@@ -7,15 +7,11 @@
 </adf-search>
 
 <div class="adf-search-results__facets">
-    <adf-search-chip-list
-        [searchFilter]="searchFilter">
-    </adf-search-chip-list>
+    <adf-search-chip-list [searchFilter]="searchFilter"></adf-search-chip-list>
 </div>
 
 <div class="adf-search-results">
-    <adf-search-filter
-        #searchFilter>
-    </adf-search-filter>
+    <adf-search-filter #searchFilter></adf-search-filter>
 
     <div class="adf-search-results__content">
         <adf-document-list
@@ -26,7 +22,7 @@
 
         <adf-pagination *ngIf="!documentList.isEmpty()"
             [target]="documentList"
-            (changePageSize)="onRefreshPagination($event)">
+            (change)="onPaginationChanged($event)">
         </adf-pagination>
     </div>
 </div>
diff --git a/src/app/components/search/search.component.ts b/src/app/components/search/search.component.ts
index 645668776..87ce6f898 100644
--- a/src/app/components/search/search.component.ts
+++ b/src/app/components/search/search.component.ts
@@ -68,7 +68,7 @@ export class SearchComponent implements OnInit {
         this.data = nodePaging;
     }
 
-    onRefreshPagination(pagination: Pagination) {
+    onPaginationChanged(pagination: Pagination) {
         this.maxItems = pagination.maxItems;
         this.skipCount = pagination.skipCount;