diff --git a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
index 4fc0b632bc..05f8b01a99 100644
--- a/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
+++ b/KeywordSearch/solr/solr/configsets/AutopsyConfig/conf/schema.xml
@@ -59,7 +59,6 @@
        1.6: added num_chunks for chunking support
        1.7 added _version_ field for Solr Cloud
        1.8 added new content_str string field and stopped copying content and file_name into content_ws
-       1.9: upgrade to Solr 6 
        2.0 added chunk_size field
      -->
 
@@ -154,11 +153,11 @@
       value verbatim (and hence don't support range queries, since the
       lexicographic ordering isn't equal to the numeric ordering)
     -->
-    <fieldType name="pint" class="solr.TrieIntField" omitNorms="true"/>
-    <fieldType name="plong" class="solr.TrieLongField" omitNorms="true"/>
-    <fieldType name="pfloat" class="solr.TrieFloatField" omitNorms="true"/>
-    <fieldType name="pdouble" class="solr.TrieDoubleField" omitNorms="true"/>
-    <fieldType name="pdate" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="pint" class="solr.IntField" omitNorms="true"/>
+    <fieldType name="plong" class="solr.LongField" omitNorms="true"/>
+    <fieldType name="pfloat" class="solr.FloatField" omitNorms="true"/>
+    <fieldType name="pdouble" class="solr.DoubleField" omitNorms="true"/>
+    <fieldType name="pdate" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
 
 
     <!--
@@ -171,10 +170,10 @@
       but with a lexicographic ordering the same as the numeric ordering,
       so that range queries work correctly.
     -->
-    <fieldType name="sint" class="solr.TrieIntField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="slong" class="solr.TrieLongField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sfloat" class="solr.TrieFloatField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sdouble" class="solr.TrieDoubleField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
+    <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
 
 
     <!-- The "RandomSortField" is not used to store or search any
@@ -227,7 +226,7 @@
       <analyzer type="index">
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="200000"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt" />
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt" enablePositionIncrements="true" />
         <!-- in this example, we will only use synonyms at query time
         <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
         -->
@@ -236,7 +235,7 @@
       <analyzer type="query">
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="200000"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt" />
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_en.txt" enablePositionIncrements="true" />
         <!--<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>-->
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
@@ -260,6 +259,7 @@
         <filter class="solr.StopFilterFactory"
                 ignoreCase="true"
                 words="stopwords_en.txt"
+                enablePositionIncrements="true"
                 />
         <filter class="solr.LowerCaseFilterFactory"/>
 		<filter class="solr.EnglishPossessiveFilterFactory"/>
@@ -275,6 +275,7 @@
         <filter class="solr.StopFilterFactory"
                 ignoreCase="true"
                 words="stopwords_en.txt"
+                enablePositionIncrements="true"
                 />
         <filter class="solr.LowerCaseFilterFactory"/>
 		<filter class="solr.EnglishPossessiveFilterFactory"/>
@@ -311,6 +312,7 @@
         <filter class="solr.StopFilterFactory"
                 ignoreCase="true"
                 words="stopwords_en.txt"
+                enablePositionIncrements="true"
                 />
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -323,6 +325,7 @@
         <filter class="solr.StopFilterFactory"
                 ignoreCase="true"
                 words="stopwords_en.txt"
+                enablePositionIncrements="true"
                 />
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -353,7 +356,7 @@
     <fieldType name="text_general_rev" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
         <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.ReversedWildcardFilterFactory" withOriginal="true"
            maxPosAsterisk="3" maxPosQuestion="2" maxFractionAsterisk="0.33"/>
@@ -361,7 +364,7 @@
       <analyzer type="query">
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" />
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
         <filter class="solr.LowerCaseFilterFactory"/>
       </analyzer>
     </fieldType>
@@ -560,8 +563,8 @@
 		also be useful for Lucene based queries containing special characters-->
    <!-- populated via copyField -->
    <field name="content_ws" type="text_ws" indexed="true" stored="false" multiValued="true" /> 
-   <field name="content_str" type="string" indexed="true" stored="true" multiValued="true" /> 
-	
+   <field name="content_str" type="string" indexed="true" stored="true" multiValued="true" />
+   
    <!-- Uncommenting the following will create a "timestamp" field using
         a default value of "NOW" to indicate when each document was indexed.
      -->
@@ -645,11 +648,11 @@
    <copyField source="content" dest="content_ws"/>
    <copyField source="file_name" dest="content_ws"/>
  -->
- 
-    <!-- Copy content into content_str field for regex searches -->
+
+   <!-- Copy content into content_str field for regex searches -->
    <copyField source="content" dest="content_str"/>
    <copyField source="file_name" dest="content_str"/>
-	
+ 
    <!-- Above, multiple source fields are copied to the [text] field. 
 	  Another way to map multiple source fields to the same 
 	  destination field is to use the dynamic field syntax.