diff --git a/app/src/app.config.json b/app/src/app.config.json
index c28817d8e8..c5290990d6 100644
--- a/app/src/app.config.json
+++ b/app/src/app.config.json
@@ -1031,14 +1031,16 @@
       {
         "id": "createdDateRange",
         "name": "SEARCH.SEARCH_HEADER.FILTERS.DATE.TITLE",
-        "columnKey": "createdAt",
         "enabled": true,
         "component": {
           "selector": "date-range",
           "settings": {
             "field": "cm:created",
-            "dateFormat": "DD-MMM-YY",
-            "maxDate": "today"
+            "dateFormat": "dd-MMM-yy",
+            "maxDate": "today",
+            "displayedLabelsByField": {
+              "cm:created": "SEARCH.SEARCH_HEADER.FILTERS.DATE.TITLE"
+            }
           }
         }
       }
diff --git a/projects/aca-content/assets/app.extensions.json b/projects/aca-content/assets/app.extensions.json
index a52f7c55b5..42e851fe77 100644
--- a/projects/aca-content/assets/app.extensions.json
+++ b/projects/aca-content/assets/app.extensions.json
@@ -1456,7 +1456,7 @@
             "name": "SEARCH.CATEGORIES.DATE",
             "enabled": true,
             "component": {
-              "selector": "date-range-advanced",
+              "selector": "date-range",
               "settings": {
                 "field": "cm:created,cm:modified",
                 "dateFormat": "dd-MMM-yy",
@@ -1646,7 +1646,7 @@
             "name": "SEARCH.CATEGORIES.DATE",
             "enabled": true,
             "component": {
-              "selector": "date-range-advanced",
+              "selector": "date-range",
               "settings": {
                 "field": "cm:created",
                 "dateFormat": "dd-MMM-yy",
@@ -1783,7 +1783,7 @@
             "name": "SEARCH.CATEGORIES.DATE",
             "enabled": true,
             "component": {
-              "selector": "date-range-advanced",
+              "selector": "date-range",
               "settings": {
                 "allowUpdateOnChange": false,
                 "hideDefaultAction": true,
@@ -1807,12 +1807,15 @@
                 "allowUpdateOnChange": false,
                 "hideDefaultAction": true,
                 "field": "cm:from",
-                "dateFormat": "DD-MMM-YY"
+                "dateFormat": "dd-MMM-yy",
+                "displayedLabelsByField": {
+                  "cm:created": "SEARCH.CATEGORIES.EFFECTIVITY_FROM"
+                }
               }
             }
           },
           {
-            "id": "createdDateRange",
+            "id": "effectivnessTo",
             "name": "SEARCH.CATEGORIES.EFFECTIVITY_TO",
             "enabled": true,
             "component": {
@@ -1821,7 +1824,10 @@
                 "allowUpdateOnChange": false,
                 "hideDefaultAction": true,
                 "field": "cm:to",
-                "dateFormat": "DD-MMM-YY"
+                "dateFormat": "dd-MMM-yy",
+                "displayedLabelsByField": {
+                  "cm:created": "SEARCH.CATEGORIES.EFFECTIVITY_FROM"
+                }
               }
             }
           }