diff --git a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml
index 469707b592..3da828c854 100755
--- a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml
+++ b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/schema.xml
@@ -45,7 +45,7 @@
     that avoids logging every request
 -->
 
-<schema name="Autopsy Keyword Search" version="2.2">
+<schema name="Autopsy Keyword Search" version="2.3">
   <!-- attribute "name" is the name of this schema and is only used for display purposes.
        Applications should change this to reflect the nature of the search collection.
        version="1.4" is Solr's version number for the schema syntax and semantics.  It should
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java
index 7c456039b3..e290c1c6e6 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java
@@ -183,7 +183,8 @@ class DropdownToolbar extends javax.swing.JPanel {
                             }
                             else {
                                 Index indexInfo = server.getIndexInfo();
-                                if (IndexFinder.getCurrentSolrVersion().equals(indexInfo.getSolrVersion())) {
+                                // ELTODO
+                                // ELTODO if (IndexFinder.getCurrentSolrVersion().equals(indexInfo.getSolrVersion())) {
                                     /*
                                      * Solr version is current, so check the Solr
                                      * schema version and selectively enable the ad
@@ -194,13 +195,13 @@ class DropdownToolbar extends javax.swing.JPanel {
                                     searchDropButton.setEnabled(true);
                                     dropPanel.setRegexSearchEnabled(schemaIsCompatible);
                                     active = true;
-                                } else {
+                                /*}  ELTODO else {
                                     /*
                                      * Unsupported Solr version, disable the ad hoc
                                      * search UI components.
                                      */
-                                    disableSearch = true;
-                                }
+                                    // ELTODO disableSearch = true;
+                                //}
                             }
                         } catch (NoOpenCoreException ex) {
                             /*
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java
index 494d19faad..85afdbff07 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java
@@ -48,8 +48,8 @@ final class Index {
      */
     Index(String indexPath, String solrVersion, String schemaVersion, String coreName, String caseName) {
         this.indexPath = uncPathUtilities.convertPathToUNC(indexPath);
-        this.solrVersion = "8"; // ELTODO solrVersion;
-        this.schemaVersion = "2.2"; // ELTODO schemaVersion; 
+        this.solrVersion = solrVersion;
+        this.schemaVersion = schemaVersion; 
         if (coreName == null || coreName.isEmpty()) {
             // come up with a new core name
             coreName = createCoreName(caseName);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java
index 9df89647a7..280abeee66 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IndexFinder.java
@@ -40,7 +40,7 @@ class IndexFinder {
     private static final String KWS_DATA_FOLDER_NAME = "data";
     private static final String INDEX_FOLDER_NAME = "index";
     private static final String CURRENT_SOLR_VERSION = "8";
-    private static final String CURRENT_SOLR_SCHEMA_VERSION = "2.2";
+    private static final String CURRENT_SOLR_SCHEMA_VERSION = "2.3";
 
     static String getCurrentSolrVersion() {
         return CURRENT_SOLR_VERSION;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index a4fcf0fa60..1d24865777 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -546,9 +546,9 @@ public class Server {
     }
     
     void start() throws KeywordSearchModuleException, SolrServerNoPortException {
-        startSolr8();
+        //startSolr8();
         
-        //startSolr4();
+        startSolr4();
         
         //startSolr8();
         
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
index 23e72c73b4..88412b7f0d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
@@ -352,7 +352,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
 
                 double currentSolrVersion = NumberUtils.toDouble(IndexFinder.getCurrentSolrVersion());
                 double indexSolrVersion = NumberUtils.toDouble(indexToUse.getSolrVersion());
-                if (indexSolrVersion == currentSolrVersion) {
+                // ELTODO if (indexSolrVersion == currentSolrVersion) {
                     // latest Solr version but schema not compatible. index should be used in read-only mode
                     if (!indexToUse.isCompatible(IndexFinder.getCurrentSchemaVersion()) && RuntimeProperties.runningWithGUI()) {
                         // pop up a message box to indicate the read-only restrictions.
@@ -374,12 +374,12 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
                     }
                     // proceed with case open
                     currentVersionIndex = indexToUse;
-                } else {
+                /* ELTODO } else {
                     // index needs to be upgraded to latest supported version of Solr
                     // ELTODO REMOVE 
                     currentVersionIndex = indexToUse;
                     // ELTODO REMOVE throw new AutopsyServiceException("Unable to find index to use for Case open");
-                }
+                }*/
             }
         }