diff --git a/solr/homeDirectoryTemplate/conf/solrconfig.xml b/solr/homeDirectoryTemplate/conf/solrconfig.xml
index b5277e82e..ca36b0a83 100644
--- a/solr/homeDirectoryTemplate/conf/solrconfig.xml
+++ b/solr/homeDirectoryTemplate/conf/solrconfig.xml
@@ -834,7 +834,7 @@
        of SearchComponents (see below) and supports distributed
        queries across multiple shards
     -->
-  <requestHandler name="/select" class="solr.SearchHandler">
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index 9d3439c58..3d8be28c8 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -592,7 +592,7 @@ page_text = page text
 
 sparql_query_results = Sparql Query Results
 no_results_returned = No results were returned.
-solr_individual_results = Search Class Individuals
+search_individual_results = Search Class Individuals
 select_vclass_uri = Select VClass
 #
 # manage proxies templates ( /templates/freemarker/body/manageproxies )
@@ -841,7 +841,7 @@ code_processing_error = An error has occurred and the code for processing this c
 
 supply_class_group = You must supply a class group.
 select_classes_to_display = You must select the classes to display.
-select_class_for_solr = You must select a class to display its individuals.
+select_class_for_search = You must select a class to display its individuals.
 supply_variable_name = You must supply a variable to save HTML content.
 apostrophe_not_allowed = The variable name should not have an apostrophe.
 double_quote_note_allowed = The variable name should not have a double quote.
diff --git a/webapp/web/js/menupage/processSolrDataGetterContent.js b/webapp/web/js/menupage/processSearchDataGetterContent.js
similarity index 100%
rename from webapp/web/js/menupage/processSolrDataGetterContent.js
rename to webapp/web/js/menupage/processSearchDataGetterContent.js
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl
index 31f427226..dd63eabec 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl
@@ -1,5 +1,5 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--This contains the template for the Solr Class individuals content type that is to be cloned and used in page management-->
+<#--This contains the template for the Search Index class individuals content type that is to be cloned and used in page management-->
 <#assign classGroup = pageData.classGroup />
 <#assign classGroups = pageData.classGroups />
 <#assign classes = pageData.classes />
@@ -22,12 +22,12 @@
 </section>
 <script>
     var i18nStringsSearchIndividuals = {
-        searchIndividuals: '${i18n().solr_individual_results}',
+        searchIndividuals: '${i18n().search_individual_results}',
         supplyQueryVariable: '${i18n().supply_query_variable}',
         noApostrophes: '${i18n().apostrophe_not_allowed}',
         noDoubleQuotes: '${i18n().double_quote_note_allowed}',
         supplyQuery: '${i18n().supply_sparql_query}',
-        selectClass: '${i18n().select_class_for_solr}'
+        selectClass: '${i18n().select_class_for_search}'
     };
 </script>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSearchDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
index 71e9c9b01..c63a0fa6f 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
@@ -81,7 +81,7 @@
                 <option value="browseClassGroup">${i18n().browse_class_group}</option>           
                 <option value="fixedHtml">${i18n().fixed_html}</option>           
                 <option value="sparqlQuery">${i18n().sparql_query_results}</option>   
-                <option value="searchIndividuals">${i18n().solr_individual_results}</option>                   
+                <option value="searchIndividuals">${i18n().search_individual_results}</option>                   
              </select>&nbsp;<span class="note">${i18n().add_types}</span>
             </section>
             <section id="contentDivs"></section>
@@ -179,7 +179,7 @@
         browseClassGroup: '${i18n().browse_class_group}',
         fixedHtml: '${i18n().fixed_html}',
         sparqlResults: '${i18n().sparql_query_results}',
-        searchIndividuals: '${i18n().solr_individual_results}',
+        searchIndividuals: '${i18n().search_individual_results}',
         orString: '${i18n().or}',
         deleteString: '${i18n().delete}',
         allCapitalized: '${i18n().all_capitalized}',