diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json
index 99fa003e6..55e116c41 100644
--- a/e2e/protractor.excludes.json
+++ b/e2e/protractor.excludes.json
@@ -5,5 +5,22 @@
   "C213134": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
   "C286252": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
   "C284666": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
-  "C286269": "temp, see https://alfresco.atlassian.net/browse/ACS-5189"
+  "C286269": "temp, see https://alfresco.atlassian.net/browse/ACS-5189",
+  "C279186": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279230": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279231": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279232": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279233": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4986",
+  "C279191": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279192": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279193": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279195": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C280051": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C280052": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279188": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C308042": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-5183",
+  "C279219": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
+  "C279221": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
+  "C279220": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985",
+  "C325006": "temp, will be fixed in https://alfresco.atlassian.net/browse/ACS-4985"
 }
diff --git a/projects/aca-content/assets/app.extensions.json b/projects/aca-content/assets/app.extensions.json
index 16631b0bf..4d02e60b4 100644
--- a/projects/aca-content/assets/app.extensions.json
+++ b/projects/aca-content/assets/app.extensions.json
@@ -1391,16 +1391,6 @@
         "facetFields": {
           "expanded": true,
           "fields": [
-            {
-              "mincount": 1,
-              "field": "content.mimetype",
-              "label": "SEARCH.FACET_FIELDS.FILE_TYPE",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 100
-              }
-            },
             {
               "mincount": 1,
               "field": "creator",
@@ -1420,70 +1410,9 @@
                 "hideDefaultAction": true,
                 "facetOrder": 300
               }
-            },
-            {
-              "mincount": 1,
-              "field": "SITE",
-              "label": "SEARCH.FACET_FIELDS.LOCATION",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 400
-              }
-            },
-            {
-              "mincount": 1,
-              "field": "TAG",
-              "label": "Tags",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 600
-              }
-            },
-            {
-              "mincount": 1,
-              "field": "cm:categories",
-              "label": "SEARCH.FACET_FIELDS.CATEGORIES",
-              "settings": {
-                "allowUpdateOnChange": false,
-                "hideDefaultAction": true,
-                "facetOrder": 700
-              }
             }
           ]
         },
-        "facetQueries": {
-          "label": "SEARCH.CATEGORIES.MODIFIED_DATE",
-          "expanded": true,
-          "queries": [
-            {
-              "label": "SEARCH.FACET_QUERIES.TODAY",
-              "query": "cm:modified:[TODAY to TODAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_WEEK",
-              "query": "cm:modified:[NOW/DAY-7DAYS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_MONTH",
-              "query": "cm:modified:[NOW/DAY-1MONTH TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.LAST_6_MONTHS",
-              "query": "cm:modified:[NOW/DAY-6MONTHS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_YEAR",
-              "query": "cm:modified:[NOW/DAY-1YEAR TO NOW/DAY+1DAY]"
-            }
-          ],
-          "settings": {
-            "allowUpdateOnChange": false,
-            "hideDefaultAction": true,
-            "facetOrder": 500
-          }
-        },
         "categories": [
           {
             "id": "logic",
@@ -1542,6 +1471,69 @@
                 "maxDate": "today"
               }
             }
+          },
+          {
+            "id": "modifiedDateRange",
+            "name": "SEARCH.CATEGORIES.MODIFIED_DATE",
+            "enabled": true,
+            "component": {
+              "selector": "date-range",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:modified",
+                "dateFormat": "DD-MMM-YY",
+                "maxDate": "today"
+              }
+            }
+          },
+          {
+            "id": "fileType",
+            "name": "SEARCH.FACET_FIELDS.FILE_TYPE",
+            "component": {
+              "selector": "",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "content.mimetype"
+              }
+            }
+          },
+          {
+            "id": "location",
+            "name": "SEARCH.FACET_FIELDS.LOCATION",
+            "component": {
+              "selector": "",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "SITE"
+              }
+            }
+          },
+          {
+            "id": "tag",
+            "name": "Tags",
+            "component": {
+              "selector": "",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "TAG"
+              }
+            }
+          },
+          {
+            "id": "categories",
+            "name": "SEARCH.FACET_FIELDS.CATEGORIES",
+            "component": {
+              "selector": "",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:categories"
+              }
+            }
           }
         ]
       },
@@ -1787,39 +1779,8 @@
                 "hideDefaultAction": true
               }
             }
-
           ]
         },
-        "facetQueries": {
-          "label": "SEARCH.CATEGORIES.MODIFIED_DATE",
-          "expanded": true,
-          "queries": [
-            {
-              "label": "SEARCH.FACET_QUERIES.TODAY",
-              "query": "cm:modified:[TODAY to TODAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_WEEK",
-              "query": "cm:modified:[NOW/DAY-7DAYS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_MONTH",
-              "query": "cm:modified:[NOW/DAY-1MONTH TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.LAST_6_MONTHS",
-              "query": "cm:modified:[NOW/DAY-6MONTHS TO NOW/DAY+1DAY]"
-            },
-            {
-              "label": "SEARCH.FACET_QUERIES.THIS_YEAR",
-              "query": "cm:modified:[NOW/DAY-1YEAR TO NOW/DAY+1DAY]"
-            }
-          ],
-          "settings": {
-            "allowUpdateOnChange": false,
-            "hideDefaultAction": true
-          }
-        },
         "categories": [
           {
             "id": "logic",
@@ -1849,6 +1810,21 @@
               }
             }
           },
+          {
+            "id": "modifiedDateRange",
+            "name": "SEARCH.CATEGORIES.MODIFIED_DATE",
+            "enabled": true,
+            "component": {
+              "selector": "date-range",
+              "settings": {
+                "allowUpdateOnChange": false,
+                "hideDefaultAction": true,
+                "field": "cm:modified",
+                "dateFormat": "DD-MMM-YY",
+                "maxDate": "today"
+              }
+            }
+          },
           {
             "id": "effectivnessFrom",
             "name": "SEARCH.CATEGORIES.EFFECTIVITY_FROM",
diff --git a/projects/aca-content/assets/i18n/en.json b/projects/aca-content/assets/i18n/en.json
index 42db5999d..011697200 100644
--- a/projects/aca-content/assets/i18n/en.json
+++ b/projects/aca-content/assets/i18n/en.json
@@ -569,13 +569,6 @@
             "EFFECTIVITY_TO": "Effectivity to",
             "LOGIC": "Logic"
         },
-        "FACET_QUERIES": {
-            "TODAY": "Today",
-            "THIS_WEEK": "This week",
-            "THIS_MONTH": "This month",
-            "LAST_6_MONTHS": "In the last 6 months",
-            "THIS_YEAR": "This year"
-        },
         "SEARCH_HEADER" : {
           "TITLE":"Filter",
           "TYPE": "Type",