diff --git a/core/collections/models.py b/core/collections/models.py
index 9cd539cce..9eb3395d6 100644
--- a/core/collections/models.py
+++ b/core/collections/models.py
@@ -37,7 +37,7 @@ class Collection(ConceptContainerModel):
         'owner_type': {'sortable': False, 'filterable': True, 'facet': True},
         'custom_validation_schema': {'sortable': False, 'filterable': True, 'facet': True},
         'canonical_url': {'sortable': True, 'filterable': True},
-        'experimental': {'sortable': False, 'filterable': False, 'facet': True},
+        'experimental': {'sortable': False, 'filterable': False, 'facet': False},
         'external_id': {'sortable': False, 'filterable': True, 'facet': False, 'exact': False},
     }
 
diff --git a/core/collections/search.py b/core/collections/search.py
index 42342a08b..067a29be8 100644
--- a/core/collections/search.py
+++ b/core/collections/search.py
@@ -9,7 +9,6 @@ class CollectionSearch(CommonSearch):
     doc_types = [Collection]
     fields = [
         'collection_type', 'locale', 'owner', 'owner_type', 'is_active', 'version', 'custom_validation_schema',
-        'experimental',
     ]
 
     facets = {
@@ -20,5 +19,4 @@ class CollectionSearch(CommonSearch):
         'is_active': TermsFacet(field='is_active'),
         'version': TermsFacet(field='version'),
         'customValidationSchema': TermsFacet(field='custom_validation_schema'),
-        'experimental': TermsFacet(field='experimental'),
     }
diff --git a/core/common/views.py b/core/common/views.py
index d3fb42172..5e84ca0de 100644
--- a/core/common/views.py
+++ b/core/common/views.py
@@ -142,7 +142,8 @@ def get_exact_search_fields(self):
 
     def get_search_string(self, lower=True):
         search_str = self.request.query_params.dict().get(SEARCH_PARAM, '').strip()
-        search_str = search_str.replace('-', '_')
+        if self.is_concept_document():
+            search_str = search_str.replace('-', '_')
         if lower:
             search_str = search_str.lower()
             search_str = search_str if is_url_encoded_string(search_str) else urllib.parse.quote_plus(search_str)
diff --git a/core/sources/models.py b/core/sources/models.py
index b9b3c47b4..70c5947ba 100644
--- a/core/sources/models.py
+++ b/core/sources/models.py
@@ -23,7 +23,7 @@ class Source(ConceptContainerModel):
         'owner_type': {'sortable': False, 'filterable': True, 'facet': True},
         'custom_validation_schema': {'sortable': False, 'filterable': True, 'facet': True},
         'canonical_url': {'sortable': True, 'filterable': True},
-        'experimental': {'sortable': False, 'filterable': False, 'facet': True},
+        'experimental': {'sortable': False, 'filterable': False, 'facet': False},
         'hierarchy_meaning': {'sortable': False, 'filterable': True, 'facet': True},
         'external_id': {'sortable': False, 'filterable': True, 'facet': False, 'exact': False},
     }
diff --git a/core/sources/search.py b/core/sources/search.py
index f40766946..a91b05e22 100644
--- a/core/sources/search.py
+++ b/core/sources/search.py
@@ -9,7 +9,7 @@ class SourceSearch(CommonSearch):
     doc_types = [Source]
     fields = [
         'source_type', 'locale', 'owner', 'owner_type', 'is_active', 'version', 'custom_validation_schema',
-        'experimental', 'hierarchy_meaning',
+        'hierarchy_meaning',
     ]
 
     facets = {
@@ -20,6 +20,5 @@ class SourceSearch(CommonSearch):
         'is_active': TermsFacet(field='is_active'),
         'version': TermsFacet(field='version'),
         'customValidationSchema': TermsFacet(field='custom_validation_schema'),
-        'experimental': TermsFacet(field='experimental'),
         'hierarchyMeaning': TermsFacet(field='hierarchy_meaning'),
     }