diff --git a/solr_home/tmdb/conf/schema.xml b/solr_home/tmdb/conf/schema.xml
index 1d7f765..fa2024c 100644
--- a/solr_home/tmdb/conf/schema.xml
+++ b/solr_home/tmdb/conf/schema.xml
@@ -64,21 +64,21 @@
        1.6: useDocValuesAsStored defaults to true.
     -->
 
-    <!-- Valid attributes for fields:
+     <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a field type from the 
+     type: mandatory - the name of a field type from the
        fieldTypes section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
      docValues: true if this field should have doc values. Doc values are
-       useful for faceting, grouping, sorting and function queries. Although not
-       required, doc values will make the index faster to load, more
-       NRT-friendly and more memory-efficient. They however come with some
-       limitations: they are currently only supported by StrField, UUIDField
-       and all Trie*Fields, and depending on the field type, they might
-       require the field to be single-valued, be required or have a default
-       value (check the documentation of the field type you're interested in
-       for more information)
+       useful (required, if you are using *Point fields) for faceting,
+       grouping, sorting and function queries. Doc values will make the index
+       faster to load, more NRT-friendly and more memory-efficient.
+       They however come with some limitations: they are currently only
+       supported by StrField, UUIDField, all *PointFields, and depending
+       on the field type, they might require the field to be single-valued,
+       be required or have a default value (check the documentation
+       of the field type you're interested in for more information)
      multiValued: true if this field may contain multiple values per document
      omitNorms: (expert) set to true to omit the norms associated with
        this field (this disables length normalization and index-time
@@ -89,9 +89,9 @@
        given field.
        When using MoreLikeThis, fields used for similarity should be
        stored for best performance.
-     termPositions: Store position information with the term vector.  
+     termPositions: Store position information with the term vector.
        This will increase storage costs.
-     termOffsets: Store offset information with the term vector. This 
+     termOffsets: Store offset information with the term vector. This
        will increase storage costs.
      required: The field is required.  It will throw an error if the
        value does not exist
@@ -126,9 +126,9 @@
     <field name="directors" type="text_general" indexed="true" stored="true" multiValued="true"/>
     <field name="genres" type="text_general" indexed="true" stored="true" multiValued="true"/>
     <field name="genres_s" type="string" indexed="true" stored="true" multiValued="true"/>
-    <field name="release_date" type="date" indexed="true" stored="true"/>
-    <field name="vote_average" docValues="false" type="float" indexed="true" stored="true" multiValued="false"/>
-    <field name="vote_count" type="int" indexed="true" stored="true" multiValued="false"/>
+    <field name="release_date" type="pdate" indexed="true" stored="true"/>
+    <field name="vote_average" docValues="false" type="pfloat" indexed="true" stored="true" multiValued="false"/>
+    <field name="vote_count" type="pint" indexed="true" stored="true" multiValued="false"/>
     <field name="cast_nomv" type="text_general" indexed="true" stored="true" multiValued="false"/>
 
 
@@ -219,7 +219,7 @@
     <copyField source="cast" dest="text_people_notf_first10"/>
     <copyField source="directors" dest="text_people_notf_first10"/>
 
-    <field name="_version_" type="long" indexed="true" stored="false"/>
+    <field name="_version_" type="plong" indexed="true" stored="false"/>
     <field name="_root_" type="string" indexed="true" stored="false" docValues="false"/>
     <field name="text_all" type="text_general" indexed="true" stored="true" multiValued="true"/>
 
@@ -265,11 +265,10 @@
 
     <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
 
-    <!-- sortMissingLast and sortMissingFirst attributes are optional attributes are
+   <!-- sortMissingLast and sortMissingFirst attributes are optional attributes are
          currently supported on types that are sorted internally as strings
          and on numeric types.
-	     This includes "string","boolean", and, as of 3.5 (and 4.x),
-	     int, float, long, date, double, including the "Trie" variants.
+             This includes "string", "boolean", "pint", "pfloat", "plong", "pdate", "pdouble".
        - If sortMissingLast="true", then a sort on this field will cause documents
          without the field to come after documents with the field,
          regardless of the requested sort order (asc or desc).
@@ -282,52 +281,22 @@
     -->
 
     <!--
-      Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-
-      These fields support doc values, but they require the field to be
-      single-valued and either be required or have a default value.
+      Numeric field types that index values using KD-trees.
+      Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
     -->
-    <fieldType name="int" class="solr.TrieIntField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="float" class="solr.TrieFloatField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="long" class="solr.TrieLongField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="double" class="solr.TrieDoubleField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
-
-    <fieldType name="ints" class="solr.TrieIntField" docValues="true" precisionStep="0" positionIncrementGap="0"
-               multiValued="true"/>
-    <fieldType name="floats" class="solr.TrieFloatField" docValues="true" precisionStep="0" positionIncrementGap="0"
-               multiValued="true"/>
-    <fieldType name="longs" class="solr.TrieLongField" docValues="true" precisionStep="0" positionIncrementGap="0"
-               multiValued="true"/>
-    <fieldType name="doubles" class="solr.TrieDoubleField" docValues="true" precisionStep="0" positionIncrementGap="0"
-               multiValued="true"/>
+    <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+    <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+    <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+    <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
 
-    <!--
-     Numeric field types that index each value at various levels of precision
-     to accelerate range queries when the number of values between the range
-     endpoints is large. See the javadoc for NumericRangeQuery for internal
-     implementation details.
-
-     Smaller precisionStep values (specified in bits) will lead to more tokens
-     indexed per value, slightly larger index size, and faster range queries.
-     A precisionStep of 0 disables indexing at different precision levels.
-    -->
-    <fieldType name="tint" class="solr.TrieIntField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tfloat" class="solr.TrieFloatField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tlong" class="solr.TrieLongField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tdouble" class="solr.TrieDoubleField" docValues="true" precisionStep="8" positionIncrementGap="0"/>
-
-    <fieldType name="tints" class="solr.TrieIntField" docValues="true" precisionStep="8" positionIncrementGap="0"
-               multiValued="true"/>
-    <fieldType name="tfloats" class="solr.TrieFloatField" docValues="true" precisionStep="8" positionIncrementGap="0"
-               multiValued="true"/>
-    <fieldType name="tlongs" class="solr.TrieLongField" docValues="true" precisionStep="8" positionIncrementGap="0"
-               multiValued="true"/>
-    <fieldType name="tdoubles" class="solr.TrieDoubleField" docValues="true" precisionStep="8" positionIncrementGap="0"
-               multiValued="true"/>
-
-    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
+    <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+    <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+    <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
+    <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+
+<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
          is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime    
+         http://www.w3.org/TR/xmlschema-2/#dateTime
          The trailing "Z" designates UTC time and is mandatory.
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
          All other components are mandatory.
@@ -342,20 +311,12 @@
                NOW/DAY+6MONTHS+3DAYS
                   ... 6 months and 3 days in the future from the start of
                       the current day
-                      
-         Consult the TrieDateField javadocs for more information.
 
-         Note: For faster range queries, consider the tdate type
+         Consult the DatePointField javadocs for more information.
       -->
-    <fieldType name="date" class="solr.TrieDateField" docValues="true" precisionStep="0" positionIncrementGap="0"/>
-    <fieldType name="dates" class="solr.TrieDateField" docValues="true" precisionStep="0" positionIncrementGap="0"
-               multiValued="true"/>
-
-    <!-- A Trie based date field for faster date range queries and date faceting. -->
-    <fieldType name="tdate" class="solr.TrieDateField" docValues="true" precisionStep="6" positionIncrementGap="0"/>
-
-    <fieldType name="tdates" class="solr.TrieDateField" docValues="true" precisionStep="6" positionIncrementGap="0"
-               multiValued="true"/>
+    <!-- KD-tree versions of date fields -->
+    <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+    <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
 
 
     <!--Binary data type. The data should be sent/retrieved in as Base64 encoded Strings -->
@@ -453,7 +414,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.SynonymGraphFilterFactory" Synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
         </analyzer>
@@ -472,7 +433,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.SynonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
         </analyzer>
@@ -491,7 +452,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.synonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
         </analyzer>
@@ -510,7 +471,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.synonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
         </analyzer>
@@ -529,7 +490,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.synonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
         </analyzer>
@@ -548,7 +509,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.synonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
         </analyzer>
@@ -568,7 +529,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.synonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
         </analyzer>
@@ -629,7 +590,7 @@
         <analyzer type="index">
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <!-- in this example, we will only use synonyms at query time
-            <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
+            <filter class="solr.synonymGraphFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
             -->
             <filter class="solr.LowerCaseFilterFactory"/>
             <filter class="solr.SynonymGraphFilterFactory" synonyms="taxonomy.txt"/>
@@ -670,7 +631,7 @@
         </analyzer>
         <analyzer type="query">
             <tokenizer class="solr.StandardTokenizerFactory"/>
-            <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+            <filter class="solr.SynonymGraphFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
             <filter class="solr.StopFilterFactory"
                     ignoreCase="true"
                     words="lang/stopwords_en.txt"
@@ -726,7 +687,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.LowerCaseFilterFactory"/>
             <filter class="solr.EnglishPossessiveFilterFactory"/>
-            <filter class="solr.SynonymFilterFactory"
+            <filter class="solr.SynonymGraphFilterFactory"
                     synonyms="name_synonyms.txt" ignoreCase="true" expand="true"/>
             <filter class="solr.EnglishMinimalStemFilterFactory"/>
         </analyzer>
@@ -739,7 +700,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.LowerCaseFilterFactory"/>
             <filter class="solr.EnglishPossessiveFilterFactory"/>
-            <filter class="solr.SynonymFilterFactory"
+            <filter class="solr.SynonymGraphFilterFactory"
                     synonyms="name_synonyms.txt" ignoreCase="true" expand="true"/>
             <filter class="solr.EnglishMinimalStemFilterFactory"/>
         </analyzer>
@@ -754,7 +715,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.LowerCaseFilterFactory"/>
             <filter class="solr.EnglishPossessiveFilterFactory"/>
-            <filter class="solr.SynonymFilterFactory"
+            <filter class="solr.SynonymGraphFilterFactory"
                     synonyms="name_synonyms.txt" ignoreCase="true" expand="true"/>
             <filter class="solr.EnglishMinimalStemFilterFactory"/>
             <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="10"
@@ -771,7 +732,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.LowerCaseFilterFactory"/>
             <filter class="solr.EnglishPossessiveFilterFactory"/>
-            <filter class="solr.SynonymFilterFactory"
+            <filter class="solr.SynonymGraphFilterFactory"
                     synonyms="name_synonyms.txt" ignoreCase="true" expand="true"/>
             <filter class="solr.EnglishMinimalStemFilterFactory"/>
             <filter class="solr.LimitTokenCountFilterFactory" maxTokenCount="2"
@@ -788,7 +749,7 @@
             <tokenizer class="solr.StandardTokenizerFactory"/>
             <filter class="solr.LowerCaseFilterFactory"/>
             <filter class="solr.EnglishPossessiveFilterFactory"/>
-            <filter class="solr.SynonymFilterFactory"
+            <filter class="solr.SynonymGraphFilterFactory"
                     synonyms="name_synonyms.txt" ignoreCase="true" expand="true"/>
             <filter class="solr.KeepWordFilterFactory"
                     words="names.txt"/>
diff --git a/solr_home/tmdb/conf/solrconfig.xml b/solr_home/tmdb/conf/solrconfig.xml
index 4a80822..2c578ac 100644
--- a/solr_home/tmdb/conf/solrconfig.xml
+++ b/solr_home/tmdb/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>6.2.0</luceneMatchVersion>
+  <luceneMatchVersion>8.4.1</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
@@ -1321,16 +1321,16 @@
       </lst>
       <lst name="typeMapping">
         <str name="valueClass">java.util.Date</str>
-        <str name="fieldType">tdates</str>
+        <str name="fieldType">pdates</str>
       </lst>
       <lst name="typeMapping">
         <str name="valueClass">java.lang.Long</str>
         <str name="valueClass">java.lang.Integer</str>
-        <str name="fieldType">tlongs</str>
+        <str name="fieldType">plongs</str>
       </lst>
       <lst name="typeMapping">
         <str name="valueClass">java.lang.Number</str>
-        <str name="fieldType">tdoubles</str>
+        <str name="fieldType">pdoubles</str>
       </lst>
     </processor>
     <processor class="solr.RunUpdateProcessorFactory"/>