diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
index e1ec41b141..07dff4b647 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.post.desc.xml
@@ -17,13 +17,13 @@
              "hitThreshold" : 1,
              "minFilterValueLength" : 5,
              "sortBy" : "ALPHABETICALLY",
-             "scope" : "SCOPED_SITES",
+             "scope" : "SCOPED_SITES", // if not provided, default value is "ALL"
              "scopedSites" : [
                      "site3",
                      "site2",
                      "site1"
               ],
-             "isEnabled" : true  // optional
+             "isEnabled" : true  // if not provided, default value is false
    }
    
    Notes:
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
index 080373fb2b..8b9be2fb85 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/solr/facet/solr-facet-config-admin.put.desc.xml
@@ -19,13 +19,13 @@
              "hitThreshold" : 1,
              "minFilterValueLength" : 5,
              "sortBy" : "ALPHABETICALLY",
-             "scope" : "SCOPED_SITES",
+             "scope" : "SCOPED_SITES",  // if not provided, default value is "ALL"
              "scopedSites" : [
                      "site3",
                      "site2",
                      "site1"
               ],
-             "isEnabled" : true  // optional
+             "isEnabled" : true  // if not provided, default value is false
    }</pre><br/>
    
    Notes:
diff --git a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java b/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
index e8d51aee8b..ab3a3c3544 100644
--- a/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/solr/facet/AbstractSolrFacetConfigAdminWebScript.java
@@ -111,9 +111,9 @@ public abstract class AbstractSolrFacetConfigAdminWebScript extends DeclarativeW
             final int hitThreshold = json.getInt(PARAM_HIT_THRESHOLD);
             final int minFilterValueLength = json.getInt(PARAM_MIN_FILTER_VALUE_LENGTH);
             final String sortBy = json.getString(PARAM_SORT_BY);
-            final String scope = json.getString(PARAM_SCOPE);
-            final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), true);
-            JSONArray scopedSitesJsonArray = json.getJSONArray(PARAM_SCOPED_SITES);
+            final String scope = getValue(String.class, json.opt(PARAM_SCOPE), "ALL");
+            final boolean isEnabled = getValue(Boolean.class, json.opt(PARAM_IS_ENABLED), false);
+            JSONArray scopedSitesJsonArray = getValue(JSONArray.class, json.opt(PARAM_SCOPED_SITES), null);
             Set<String> scopedSites = null;
             if (scopedSitesJsonArray != null)
             {