diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json
index a06f7381b7f..a9b1c809e2b 100644
--- a/demo-shell/resources/i18n/en.json
+++ b/demo-shell/resources/i18n/en.json
@@ -351,7 +351,6 @@
     }
   },
   "SEARCH_FORMS": {
-    "ALL": "All",
-    "RECORD_MANAGEMENT": "Record Management"
+    "ALL": "All"
   }
 }
diff --git a/demo-shell/src/app.config.json b/demo-shell/src/app.config.json
index b97f154aee4..b5095858655 100644
--- a/demo-shell/src/app.config.json
+++ b/demo-shell/src/app.config.json
@@ -34,7 +34,7 @@
     "copyright": "© 2016 - 2021 Alfresco Software, Inc. All Rights Reserved."
   },
   "notifications": true,
-  "search": {
+  "search": [{
     "filterWithContains": true,
     "app:fields": [
       "cm:name",
@@ -366,8 +366,9 @@
         }
       ]
     },
-    "name": "SEARCH_FORMS.ALL"
-  },
+    "name": "SEARCH_FORMS.ALL",
+    "default": true
+  }],
   "search-headers": {
     "filterWithContains": true,
     "app:fields": [
diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
index 871ac9e6221..a1e55dd7b2c 100644
--- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
+++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts
@@ -67,9 +67,11 @@ export class SearchRadioComponent implements SearchWidget, OnInit {
         const initialValue = this.getSelectedValue();
 
         if (initialValue !== null) {
-            this.setValue(initialValue);
+            this.value = initialValue;
+            this.context.queryFragments[this.id] = initialValue;
         } else if (this.startValue !== null) {
-            this.setValue(initialValue);
+            this.value = initialValue;
+            this.context.queryFragments[this.id] = initialValue;
         }
     }