diff --git a/solr_conf/conf/schema.xml b/solr_conf/conf/schema.xml
index b2babed14..88278898a 100644
--- a/solr_conf/conf/schema.xml
+++ b/solr_conf/conf/schema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema name="Argo" version="1.5">
+<schema name="Argo Prod" version="1.5">
   <!-- NOTE: various comments and unused configuration possibilities have been purged
      from this file.  Please refer to http://wiki.apache.org/solr/SchemaXml,
      as well as the default schema file included with Solr -->
@@ -8,56 +8,41 @@
 
   <fields>
     <field name="id" type="string" stored="true" indexed="true" multiValued="false" required="true"/>
+    <!-- DEPRECATED: "long" is a Trie based field type; use solr.LongPointField class instead ... -->
     <field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+    <!-- DEPRECATED: "date" is a Trie based field type; use solr.DatePointField class instead ... -->
     <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
 
-    <field name="lat" type="tdouble" stored="true" indexed="true" multiValued="false"/>
-    <field name="lng" type="tdouble" stored="true" indexed="true" multiValued="false"/>
-
     <!-- NOTE:  not all possible Solr field types are represented in the dynamic fields -->
 
-    <!-- text (_t...) -->
-    <dynamicField name="*_ti"    type="text" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_tim"   type="text" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_ts"    type="text" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_tsm"   type="text" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_tsi"   type="text" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_tsim"  type="text" stored="true"  indexed="true"  multiValued="true"/>
-    <dynamicField name="*_tiv"   type="text" stored="false" indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_timv"  type="text" stored="false" indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tsiv"  type="text" stored="true"  indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tsimv" type="text" stored="true"  indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
-
-    <!-- English text (_te...) -->
-    <dynamicField name="*_tei"    type="text_en" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_teim"   type="text_en" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_tes"    type="text_en" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_tesm"   type="text_en" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_tesi"   type="text_en" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_tesim"  type="text_en" stored="true"  indexed="true"  multiValued="true"/>
-    <dynamicField name="*_teiv"   type="text_en" stored="false" indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_teimv"  type="text_en" stored="false" indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tesiv"  type="text_en" stored="true"  indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
-    <dynamicField name="*_tesimv" type="text_en" stored="true"  indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
-
     <!-- string (_s...) -->
-    <dynamicField name="*_si"    type="string"    stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_sim"   type="string"    stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_ss"    type="string"    stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_ssm"   type="string"    stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_ssi"   type="string"    stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_ssim"  type="string"    stored="true"  indexed="true"  multiValued="true"/>
-    <dynamicField name="*_ssort" type="alphaSort" stored="false" indexed="true"  multiValued="false"/>
-
-    <!-- integer (_i...) -->
+    <!-- docValues true makes for faster facets, but more storage -->
+    <dynamicField name="*_si"     type="string"    stored="false" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_sim"    type="string"    stored="false" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_ss"     type="string"    stored="true"  indexed="false" multiValued="false"/>
+    <dynamicField name="*_ssm"    type="string"    stored="true"  indexed="false" multiValued="true"/>
+    <dynamicField name="*_ssi"    type="string"    stored="true"  indexed="true"  multiValued="false"/>
+    <dynamicField name="*_ssidv"  type="string"    stored="true"  indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_ssim"   type="string"    stored="true"  indexed="true"  multiValued="true"/>
+    <dynamicField name="*_ssimdv" type="string"    stored="true"  indexed="true"  multiValued="true"  docValues="true"/>
+
+    <!-- IntPointField integer (_ip...) (very efficient searches for specific values, or ranges of values) -->
+    <!-- docValues true makes for faster facets, but more storage -->
+    <dynamicField name="*_ipi"    type="intPoint" stored="false" indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_ipim"   type="intPoint" stored="false" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_ips"    type="intPoint" stored="true"  indexed="false" multiValued="false" docValues="true"/>
+    <dynamicField name="*_ipsm"   type="intPoint" stored="true"  indexed="false" multiValued="true"/>
+    <dynamicField name="*_ipsi"   type="intPoint" stored="true"  indexed="true"  multiValued="false"/>
+    <dynamicField name="*_ipsidv" type="intPoint" stored="true"  indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_ipsim"  type="intPoint" stored="true"  indexed="true"  multiValued="true"/>
+    <!-- DEPRECATED: use IntPointField (_ip...) instead as type int is TrieInteger integer (_i...) -->
     <dynamicField name="*_ii"   type="int" stored="false" indexed="true"  multiValued="false"/>
     <dynamicField name="*_iim"  type="int" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_is"   type="int" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_ism"  type="int" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_isi"  type="int" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_isim" type="int" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- trie integer (_it...) (for faster range queries) -->
+    <dynamicField name="*_is"   type="int" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_ism"  type="int" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_isi"  type="int" stored="true" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_isim" type="int" stored="true" indexed="true"  multiValued="true"/>
+    <!-- DEPRECATED: trie integer (_it...) (for faster range queries) -->
     <dynamicField name="*_iti"   type="tint" stored="false" indexed="true"  multiValued="false"/>
     <dynamicField name="*_itim"  type="tint" stored="false" indexed="true"  multiValued="true"/>
     <dynamicField name="*_its"   type="tint" stored="true"  indexed="false" multiValued="false"/>
@@ -65,140 +50,119 @@
     <dynamicField name="*_itsi"  type="tint" stored="true"  indexed="true"  multiValued="false"/>
     <dynamicField name="*_itsim" type="tint" stored="true"  indexed="true"  multiValued="true"/>
 
-    <!-- date (_dt...) -->
+    <!-- DatePointField (_dtp...) (very efficient searches for specific values, or ranges of values) -->
+    <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
+         Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z -->
+    <!-- docValues true makes for faster facets, but more storage -->
+    <dynamicField name="*_dtpi"     type="datePoint" stored="false" indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_dtpim"    type="datePoint" stored="false" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_dtps"     type="datePoint" stored="true"  indexed="false" multiValued="false" docValues="true"/>
+    <dynamicField name="*_dtpsm"    type="datePoint" stored="true"  indexed="false" multiValued="true"/>
+    <dynamicField name="*_dtpsi"    type="datePoint" stored="true"  indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_dtpsidv"  type="datePoint" stored="true"  indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_dtpsim"   type="datePoint" stored="true"  indexed="true"  multiValued="true"/>
+    <dynamicField name="*_dtpsimdv" type="datePoint" stored="true"  indexed="true"  multiValued="true"  docValues="true"/>
+    <!-- DEPRECATED: (_dt...) type date is a TrieDate -->
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z -->
     <dynamicField name="*_dti"   type="date" stored="false" indexed="true"  multiValued="false"/>
     <dynamicField name="*_dtim"  type="date" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_dts"   type="date" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_dtsm"  type="date" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_dtsi"  type="date" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_dtsim" type="date" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- trie date (_dtt...) (for faster range queries) -->
+    <dynamicField name="*_dts"   type="date" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_dtsm"  type="date" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_dtsi"  type="date" stored="true" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_dtsim" type="date" stored="true" indexed="true"  multiValued="true"/>
+    <!-- DEPRECATED: trie date (_dtt...) (for faster range queries) -->
     <dynamicField name="*_dtti"   type="tdate" stored="false" indexed="true"  multiValued="false"/>
     <dynamicField name="*_dttim"  type="tdate" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_dtts"   type="tdate" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_dttsm"  type="tdate" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_dttsi"  type="tdate" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_dttsim" type="tdate" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- long (_l...) -->
-    <dynamicField name="*_li"   type="long" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_lim"  type="long" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_ls"   type="long" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_lsm"  type="long" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_lsi"  type="long" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_lsim" type="long" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- trie long (_lt...) (for faster range queries) -->
-    <dynamicField name="*_lti"   type="tlong" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_ltim"  type="tlong" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_lts"   type="tlong" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_ltsm"  type="tlong" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_ltsi"  type="tlong" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_ltsim" type="tlong" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- double (_db...) -->
+    <dynamicField name="*_dtts"   type="tdate" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_dttsm"  type="tdate" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_dttsi"  type="tdate" stored="true" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_dttsim" type="tdate" stored="true" indexed="true"  multiValued="true"/>
+
+    <!-- DoublePointField (_dbp...) (very efficient searches for specific values, or ranges of values) -->
+    <dynamicField name="*_dbpi"   type="doublePoint" stored="false" indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_dbpim"  type="doublePoint" stored="false" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_dbps"   type="doublePoint" stored="true"  indexed="false" multiValued="false" docValues="true"/>
+    <dynamicField name="*_dbpsm"  type="doublePoint" stored="true"  indexed="false" multiValued="true"/>
+    <dynamicField name="*_dbpsi"  type="doublePoint" stored="true"  indexed="true"  multiValued="false" docValues="true"/>
+    <dynamicField name="*_dbpsim" type="doublePoint" stored="true"  indexed="true"  multiValued="true"/>
+    <!-- DEPRECATED: double is a TrieDouble (_db...) -->
     <dynamicField name="*_dbi"   type="double" stored="false" indexed="true"  multiValued="false"/>
     <dynamicField name="*_dbim"  type="double" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_dbs"   type="double" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_dbsm"  type="double" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_dbsi"  type="double" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_dbsim" type="double" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- trie double (_dbt...) (for faster range queries) -->
+    <dynamicField name="*_dbs"   type="double" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_dbsm"  type="double" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_dbsi"  type="double" stored="true" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_dbsim" type="double" stored="true" indexed="true"  multiValued="true"/>
+    <!-- DEPRECATED: trie double (_dbt...) (for faster range queries) -->
     <dynamicField name="*_dbti"   type="tdouble" stored="false" indexed="true"  multiValued="false"/>
     <dynamicField name="*_dbtim"  type="tdouble" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_dbts"   type="tdouble" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_dbtsm"  type="tdouble" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_dbtsi"  type="tdouble" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_dbtsim" type="tdouble" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- float (_f...) -->
-    <dynamicField name="*_fi"   type="float" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_fim"  type="float" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_fs"   type="float" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_fsm"  type="float" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_fsi"  type="float" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_fsim" type="float" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- trie float (_ft...) (for faster range queries) -->
-    <dynamicField name="*_fti"   type="tfloat" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_ftim"  type="tfloat" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_fts"   type="tfloat" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_ftsm"  type="tfloat" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_ftsi"  type="tfloat" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_ftsim" type="tfloat" stored="true"  indexed="true"  multiValued="true"/>
+    <dynamicField name="*_dbts"   type="tdouble" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_dbtsm"  type="tdouble" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_dbtsi"  type="tdouble" stored="true" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_dbtsim" type="tdouble" stored="true" indexed="true"  multiValued="true"/>
 
     <!-- boolean (_b...) -->
     <dynamicField name="*_bi"  type="boolean" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_bs"  type="boolean" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_bsi" type="boolean" stored="true"  indexed="true"  multiValued="false"/>
-
-    <!-- Type used to index the lat and lon components for the "location" FieldType -->
-    <dynamicField name="*_coordinate" type="tdouble" indexed="true"  stored="false" />
-
-    <!-- location (_ll...) -->
-    <dynamicField name="*_lli"   type="location" stored="false" indexed="true"  multiValued="false"/>
-    <dynamicField name="*_llim"  type="location" stored="false" indexed="true"  multiValued="true"/>
-    <dynamicField name="*_lls"   type="location" stored="true"  indexed="false" multiValued="false"/>
-    <dynamicField name="*_llsm"  type="location" stored="true"  indexed="false" multiValued="true"/>
-    <dynamicField name="*_llsi"  type="location" stored="true"  indexed="true"  multiValued="false"/>
-    <dynamicField name="*_llsim" type="location" stored="true"  indexed="true"  multiValued="true"/>
-
-    <!-- you must define copyField source and dest fields explicity or schemaBrowser doesn't work -->
-    <field name="all_text_timv" type="text" stored="false" indexed="true" multiValued="true" termVectors="true" termPositions="true" termOffsets="true"/>
-
-    <!-- uncomment the following to ignore any fields that don't already match an existing
-         field name or dynamic field, rather than reporting them as an error.
-         alternately, change the type="ignored" to some other type e.g. "text" if you want
-         unknown fields indexed and/or stored by default -->
-    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-
-    <!-- END hydra deprecated items -->
-
-    <!-- START argo customization artifacts -->
-    <field name="text"        type="text_ws" indexed="true" stored="false" multiValued="true"/>
-    <field name="text_search" type="text"    indexed="true" stored="false" multiValued="true"/>
-    <field name="text_unstem_search" type="textNoStem" indexed="true" stored="false" multiValued="true"/>
-    <field name="date"        type="date"    indexed="true" stored="true" multiValued="true"/>
-
-    <dynamicField name="*_i"  type="tint"    indexed="true"  stored="true"/>
-    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="*_l"  type="tlong"   indexed="true"  stored="true"/>
-    <dynamicField name="*_b"  type="boolean" indexed="true"  stored="true"/>
-    <dynamicField name="*_f"  type="tfloat"  indexed="true"  stored="true"/>
-    <dynamicField name="*_d"  type="tdouble" indexed="true"  stored="true"/>
-    <dynamicField name="*_dt" type="date"    indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="*_t"  type="text"    indexed="true"  stored="true" multiValued="true"/>
-    <dynamicField name="*_t_ws" type="text_ws" indexed="true" stored="false" multiValued="true"/>
-    <dynamicField name="*_t_unstem_search"  type="textNoStem" indexed="true"  stored="false" multiValued="true"/>
-
-    <dynamicField name="random*" type="rand" />
-
-    <dynamicField name="*_sort"    type="alphaSort" indexed="true"  stored="false" multiValued="false" />
-    <dynamicField name="*_dt_sort" type="tdate"     indexed="true"  stored="false" multiValued="false" />
-    <dynamicField name="*_facet"   type="string"    indexed="true"  stored="true"  multiValued="true" />
-    <dynamicField name="*_display" type="string"    indexed="false" stored="true"  multiValued="true" />
-    <!-- END argo customization artifacts -->
+    <dynamicField name="*_bs"  type="boolean" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_bsi" type="boolean" stored="true" indexed="true"  multiValued="false"/>
+
+    <!-- English text (_ten...) -->
+    <dynamicField name="*_teni"    type="textEnglish" stored="false" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_tenim"   type="textEnglish" stored="false" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_tens"    type="textEnglish" stored="true"  indexed="false" multiValued="false"/>
+    <dynamicField name="*_tensm"   type="textEnglish" stored="true"  indexed="false" multiValued="true"/>
+    <dynamicField name="*_tensi"   type="textEnglish" stored="true"  indexed="true"  multiValued="false"/>
+    <dynamicField name="*_tensim"  type="textEnglish" stored="true"  indexed="true"  multiValued="true"/>
+    <dynamicField name="*_teniv"   type="textEnglish" stored="false" indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_tenimv"  type="textEnglish" stored="false" indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_tensiv"  type="textEnglish" stored="true"  indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_tensimv" type="textEnglish" stored="true"  indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
+    <!-- DEPRECATED: use textEnglish (_ten...) or textUnstemmed (..text_unstemmed...) instead -->
+    <dynamicField name="*_ti"    type="text" stored="false" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_tim"   type="text" stored="false" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_ts"    type="text" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_tsm"   type="text" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_tsi"   type="text" stored="true" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_tsim"  type="text" stored="true" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_tiv"   type="text" stored="false" indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_timv"  type="text" stored="false" indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_tsiv"  type="text" stored="true" indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_tsimv" type="text" stored="true" indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
+    <!-- DEPRECATED: text_en is a deprecated type -->
+    <dynamicField name="*_tei"    type="text_en" stored="false" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_teim"   type="text_en" stored="false" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_tes"    type="text_en" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_tesm"   type="text_en" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_tesi"   type="text_en" stored="true" indexed="true"  multiValued="false"/>
+    <dynamicField name="*_tesim"  type="text_en" stored="true" indexed="true"  multiValued="true"/>
+    <dynamicField name="*_teiv"   type="text_en" stored="false" indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_teimv"  type="text_en" stored="false" indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_tesiv"  type="text_en" stored="true" indexed="true"  multiValued="false" termVectors="true" termPositions="true" termOffsets="true"/>
+    <dynamicField name="*_tesimv" type="text_en" stored="true" indexed="true"  multiValued="true"  termVectors="true" termPositions="true" termOffsets="true"/>
+
+    <!-- Text tokenized without stemming -->
+    <dynamicField name="*_text_unstemmed_i"   type="textUnstemmed" indexed="true"  stored="false" multiValued="false"/>
+    <dynamicField name="*_text_unstemmed_im"  type="textUnstemmed" indexed="true"  stored="false" multiValued="true"/>
+    <dynamicField name="*_text_unstemmed_si"  type="textUnstemmed" indexed="true"  stored="true"  multiValued="false"/>
+    <dynamicField name="*_text_unstemmed_sim" type="textUnstemmed" indexed="true"  stored="true"  multiValued="true"/>
+    <!-- DEPRECATED:  textNoStem is a deprecated type -->
+    <dynamicField name="*_text_nostem_i"  type="textNoStem" indexed="true"  stored="false" multiValued="false"/>
+    <dynamicField name="*_text_nostem_im" type="textNoStem" indexed="true"  stored="false" multiValued="true"/>
+
+    <!-- Text tokenized without stemming but left and right anchored, for "exactish" matches -->
+    <dynamicField name="*_text_anchored_i"  type="textAnchored" indexed="true"  stored="false" multiValued="false"/>
+    <dynamicField name="*_text_anchored_im" type="textAnchored" indexed="true"  stored="false" multiValued="true"/>
   </fields>
 
-<!-- START argo customization artifacts -->
-  <copyField source="*_dt"    dest="date" />
-  <copyField source="*_t"     dest="text" />
-  <copyField source="*_t"     dest="text_search" />
-  <copyField source="*_t"     dest="text_unstem_search" />
-  <copyField source="title_t" dest="title_t_ws" />
-  <copyField source="title_t" dest="title_t_unstem_search" />
-  <copyField source="identityMetadata_t" dest="identityMetadata_t_ws" />
-  <copyField source="identityMetadata_t" dest="identityMetadata_t_unstem_search" />
-<!-- END argo customization artifacts -->
-
   <types>
     <fieldType name="string"  class="solr.StrField" sortMissingLast="true" />
     <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
-    <fieldType name="rand"    class="solr.RandomSortField" omitNorms="true"/>
+
+    <fieldType name="intPoint" class="solr.IntPointField" />
+    <fieldType name="datePoint" class="solr.DatePointField" />
+    <fieldType name="doublePoint" class="solr.DoublePointField" />
+
+    <!-- DEPRECATED: All Trie* numeric and date field types have been deprecated in favor of *Point field types. -->
 
     <!-- Default numeric field types.  -->
     <fieldType name="int"     class="solr.TrieIntField"    precisionStep="0" positionIncrementGap="0"/>
@@ -209,7 +173,6 @@
     <!-- trie numeric field types for faster range queries -->
     <fieldType name="tint"    class="solr.TrieIntField"    precisionStep="8" positionIncrementGap="0"/>
     <fieldType name="tfloat"  class="solr.TrieFloatField"  precisionStep="8" positionIncrementGap="0"/>
-    <fieldType name="tlong"   class="solr.TrieLongField"   precisionStep="8" positionIncrementGap="0"/>
     <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z
@@ -219,29 +182,86 @@
     <!-- A Trie based date field for faster date range queries and date faceting. -->
     <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
 
-    <!-- This point type indexes the coordinates as separate fields (subFields)
-      If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if
-      subFieldSuffix is defined, that is used to create the subFields.
-      Example: if subFieldType="double", then the coordinates would be
-        indexed in fields myloc_0___double,myloc_1___double.
-      Example: if subFieldSuffix="_d" then the coordinates would be indexed
-        in fields myloc_0_d,myloc_1_d
-      The subFields are an implementation detail of the fieldType, and end
-      users normally should not need to know about them.
-     -->
-    <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
+   <!-- Text stemmed for English -->
+    <fieldtype name="textEnglish" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
+      <analyzer type="index">
+        <!-- remove stand-alone punctuation, which gets dropped by the WDGFF but an empty hole is left in the position and screws up phrase searches -->
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="\s+(\p{Punct}+)\s+" replacement=" " />
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="solr.ICUFoldingFilterFactory"/>  <!-- NFKC_Casefold, diacritics removed -->
+        <filter class="solr.WordDelimiterGraphFilterFactory"
+          splitOnCaseChange="1" generateWordParts="1" catenateWords="1"
+          splitOnNumerics="0" generateNumberParts="1" catenateNumbers="1"
+          catenateAll="0" preserveOriginal="0" stemEnglishPossessive="1" />
+        <filter class="solr.FlattenGraphFilterFactory"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory" />
+        <filter class="solr.SnowballPorterFilterFactory" language="English"/>
+      </analyzer>
+      <analyzer type="query">
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="\s+(\p{Punct}+)\s+" replacement=" " />
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="solr.ICUFoldingFilterFactory"/>
+        <filter class="solr.WordDelimiterGraphFilterFactory"
+          splitOnCaseChange="1" generateWordParts="1" catenateWords="1"
+          splitOnNumerics="0" generateNumberParts="1" catenateNumbers="1"
+          catenateAll="0" preserveOriginal="0" stemEnglishPossessive="1" />
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory" />
+        <filter class="solr.SnowballPorterFilterFactory" language="English"/>
+      </analyzer>
+    </fieldtype>
 
-    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+    <!-- Text tokenized and case folded but not stemmed -->
+    <fieldtype name="textUnstemmed" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
+      <analyzer type="index">
+        <!-- for whitespace separated chars that will be processed as their own token stream at query time, e.g. in 'felines : warm and fuzzy' -->
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="\s+(\p{Punct}+)\s+" replacement=" " />
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="solr.ICUFoldingFilterFactory"/>  <!-- NFKC_Casefold, diacritics removed -->
+        <filter class="solr.WordDelimiterGraphFilterFactory"
+          splitOnCaseChange="1" generateWordParts="1" catenateWords="1"
+          splitOnNumerics="0" generateNumberParts="1" catenateNumbers="1"
+          catenateAll="0" preserveOriginal="0" stemEnglishPossessive="0" />
+        <filter class="solr.FlattenGraphFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="\s+(\p{Punct}+)\s+" replacement=" " />
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="solr.ICUFoldingFilterFactory"/>
+        <filter class="solr.WordDelimiterGraphFilterFactory"
+          splitOnCaseChange="1" generateWordParts="1" catenateWords="1"
+          splitOnNumerics="0" generateNumberParts="1" catenateNumbers="1"
+          catenateAll="0" preserveOriginal="0" stemEnglishPossessive="0" />
+      </analyzer>
+    </fieldtype>
 
-    <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
-      For more information about this and other Spatial fields new to Solr 4, see:
-      http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
-    -->
-    <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-      geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
+    <!-- Left and right anchored tokenized text, without stemming, for "exactish" matches -->
+    <fieldtype name="textAnchored" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
+      <analyzer type="index">
+        <!-- for whitespace separated chars that will be processed as their own token stream at query time, e.g. in 'felines : warm and fuzzy' -->
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="\s+(\p{Punct}+)\s+" replacement=" " />
+        <!-- anchor beginning and ending of field value, removing trailing chars -->
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="^\s*(.*[\S&amp;&amp;[^\.\,:;/=&lt;&gt;\(\)\[\]\&amp;\|]])[\s\.\,:;/=&lt;&gt;\(\)\[\]\&amp;\|]*$" replacement="aaaaaa$1zzzzzz"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="solr.ICUFoldingFilterFactory"/>  <!-- NFKC_Casefold, diacritics removed -->
+        <filter class="solr.WordDelimiterGraphFilterFactory"
+          splitOnCaseChange="1" generateWordParts="1" catenateWords="1"
+          splitOnNumerics="0" generateNumberParts="1" catenateNumbers="1"
+          catenateAll="0" preserveOriginal="0" stemEnglishPossessive="1" />
+        <filter class="solr.FlattenGraphFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="\s+(\p{Punct}+)\s+" replacement=" " />
+        <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="^\s*(.*[\S&amp;&amp;[^\.\,:;/=&lt;&gt;\(\)\[\]\&amp;\|]])[\s\.\,:;/=&lt;&gt;\(\)\[\]\&amp;\|]*$" replacement="aaaaaa$1zzzzzz"/>
+        <tokenizer class="solr.WhitespaceTokenizerFactory" />
+        <filter class="solr.ICUFoldingFilterFactory"/>
+        <filter class="solr.WordDelimiterGraphFilterFactory"
+          splitOnCaseChange="1" generateWordParts="1" catenateWords="1"
+          splitOnNumerics="0" generateNumberParts="1" catenateNumbers="1"
+          catenateAll="0" preserveOriginal="0" stemEnglishPossessive="1" />
+      </analyzer>
+    </fieldtype>
 
+    <!-- DEPRECATED:  use textUnstemmed or textEnglish. tokenized, case folded -->
     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>
         <tokenizer class="solr.ICUTokenizerFactory"/>
@@ -250,15 +270,7 @@
       </analyzer>
     </fieldType>
 
-    <!-- A text field that only splits on whitespace for exact matching of words -->
-    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.TrimFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <!-- Analyzed Text, no Stemming or Synonyms -->
+   <!-- DEPRECATED:  use textUnstemmed, as WordDelimiterFilterFactory is deprecated.  Analyzed Text, no Stemming or Synonyms -->
     <fieldtype name="textNoStem" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
@@ -269,16 +281,7 @@
       </analyzer>
     </fieldtype>
 
-    <!-- single token analyzed text, for sorting.  Punctuation is significant. -->
-    <fieldtype name="alphaSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-        <filter class="solr.ICUFoldingFilterFactory"/>
-        <filter class="solr.TrimFilterFactory" />
-      </analyzer>
-    </fieldtype>
-
-    <!-- A text field with defaults appropriate for English -->
+    <!-- DEPRECATED:  use textEnglish, as more aggressive stemming desired.  A text field with defaults appropriate for English -->
     <fieldType name="text_en" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.ICUTokenizerFactory"/>
@@ -286,33 +289,8 @@
         <filter class="solr.EnglishPossessiveFilterFactory"/>
         <!-- EnglishMinimalStemFilterFactory is less aggressive than PorterStemFilterFactory: -->
         <filter class="solr.EnglishMinimalStemFilterFactory"/>
-        <!--
-        <filter class="solr.PorterStemFilterFactory"/>
-        -->
         <filter class="solr.TrimFilterFactory"/>
       </analyzer>
     </fieldType>
-
-    <!-- queries for paths match documents at that path, or in descendent paths -->
-    <fieldType name="descendent_path" class="solr.TextField">
-      <analyzer type="index">
-        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-    </fieldType>
-
-    <!-- queries for paths match documents at that path, or in ancestor paths -->
-    <fieldType name="ancestor_path" class="solr.TextField">
-      <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory" />
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/" />
-      </analyzer>
-    </fieldType>
-
   </types>
-
 </schema>
diff --git a/solr_conf/conf/solrconfig.xml b/solr_conf/conf/solrconfig.xml
index 696e35efa..e0963a6f3 100644
--- a/solr_conf/conf/solrconfig.xml
+++ b/solr_conf/conf/solrconfig.xml
@@ -5,12 +5,12 @@
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
   <!-- NOTE: various comments and unused configuration possibilities have been purged
-     from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
-     as well as the default solrconfig file included with Solr -->
+    from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
+    as well as the default solrconfig file included with Solr, and with blacklight -->
 
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <luceneMatchVersion>6.6.0</luceneMatchVersion>
+  <luceneMatchVersion>8.11.2</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
@@ -22,13 +22,7 @@
     </updateLog>
   </updateHandler>
 
-  <jmx />
-
-  <!-- Used by reports via queries that pass qt=search -->
   <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
-      -->
     <lst name="defaults">
       <str name="defType">edismax</str>
       <str name="echoParams">explicit</str>
@@ -37,72 +31,240 @@
       <int name="qs">1</int>
       <int name="ps">2</int>
       <float name="tie">0.01</float>
-      <!-- this qf and pf are used by default, if not otherwise specified by
-           client. The default blacklight_config will use these for the
-           "keywords" search. See the author_qf/author_pf, title_qf, etc
-           below, which the default blacklight_config will specify for
-           those searches. You may also be interested in:
-           http://wiki.apache.org/solr/LocalParams
-      -->
-       <str name="qf">
-         id
-         all_text_timv
-         active_fedora_model_ssi
-         object_type_si
-       </str>
-       <str name="pf">
-         all_text_timv^10
-       </str>
-
-      <str name="author_qf"></str>
-      <str name="author_pf"></str>
-      <str name="title_qf"></str>
-      <str name="title_pf"></str>
-      <str name="subject_qf"></str>
-      <str name="subject_pf"></str>
+      <bool name="lowercaseOperators">true</bool>
       <str name="fl"> *, score</str>
 
+      <str name="qf">
+        sw_display_title_tesim^5
+        contributor_text_nostem_im^3
+        topic_tesim^2
+
+        tag_text_unstemmed_sim
+
+        originInfo_place_placeTerm_tesim
+        originInfo_publisher_tesim
+
+        content_type_ssim
+        sw_format_ssim
+        object_type_ssim
+
+        descriptive_text_nostem_i
+        descriptive_tiv
+        descriptive_teiv
+
+        collection_title_tesim
+
+        id
+        objectId_tesim
+        obj_label_tesim
+        identifier_ssim
+        identifier_tesim
+        barcode_id_ssim
+        folio_instance_hrid_ssim
+        source_id_text_nostem_i^3
+        source_id_ssi
+        previous_ils_ids_ssim
+        doi_ssim
+        contributor_orcids_ssim
+      </str>
+      <str name="pf">  <!-- (defType dismax, edismax: phrase boost within result set) -->
+        sw_display_title_tesim^25
+        contributor_text_nostem_im^15
+        topic_tesim^10
+
+        descriptive_text_nostem_i^5
+        descriptive_tiv^3
+        descriptive_teiv^2
+
+        collection_title_tesim^5
+
+        objectId_tesim^5
+        obj_label_tesim^5
+        identifier_tesim^5
+        source_id_text_nostem_i^5
+      </str>
+      <str name="pf3">  <!-- (defType edismax: token trigrams boost within result set) -->
+        sw_display_title_tesim^15
+        contributor_text_nostem_im^9
+        topic_tesim^6
+
+        descriptive_text_nostem_i^15
+        descriptive_tiv^9
+        descriptive_teiv^6
+
+        collection_title_tesim^3
+
+        objectId_tesim^3
+        obj_label_tesim^3
+        identifier_tesim^3
+        source_id_text_nostem_i^3
+      </str>
+      <str name="pf2"> <!--(defType edismax: token bigrams boost within result set) -->
+        sw_display_title_tesim^10
+        contributor_text_nostem_im^6
+        topic_tesim^4
+
+        descriptive_text_nostem_i^10
+        descriptive_tiv^6
+        descriptive_teiv^4
+
+        collection_title_tesim^2
+
+        objectId_tesim^2
+        obj_label_tesim^2
+        identifier_tesim^2
+        source_id_text_nostem_i^2
+      </str>
+
       <str name="facet">true</str>
       <str name="facet.mincount">1</str>
       <str name="facet.limit">10</str>
-      <str name="facet.field">active_fedora_model_ssi</str>
-      <str name="facet.field">object_type_si</str>
-
-      <str name="spellcheck">true</str>
-      <str name="spellcheck.dictionary">default</str>
-      <str name="spellcheck.onlyMorePopular">true</str>
-      <str name="spellcheck.extendedResults">true</str>
-      <str name="spellcheck.collate">false</str>
-      <str name="spellcheck.count">5</str>
+      <str name="facet.field">objectType_ssim</str>
+      <str name="f.objectType_ssim.facet.sort">index</str>
+      <str name="f.objectType_ssim.facet.method">enum</str>
+      <str name="facet.field">content_type_ssim</str>
+      <str name="f.content_type_ssim.facet.sort">index</str>
+      <str name="f.content_type_ssim.facet.method">enum</str>
+      <str name="facet.field">nonhydrus_apo_title_ssim</str>
+      <str name="facet.field">released_to_earthworks_dtsi</str>
+      <str name="facet.field">released_to_searchworks_dtsi</str>
     </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
   </requestHandler>
 
-  <requestHandler name="/argosearch" class="solr.SearchHandler"> <!-- experimental/useless -->
+  <!-- for relevancy experiments -->
+  <requestHandler name="qttest" class="solr.SearchHandler">
     <lst name="defaults">
-      <str name="defType">lucene</str>
-      <str name="df">has_model_s</str>
-      <str name="q.alt">*:*</str>
-      <str name="q.op">AND</str>
-      <str name="facet">on</str>
-      <str name="facet.mincount">1</str>
+      <str name="defType">edismax</str>
       <str name="echoParams">explicit</str>
+      <str name="q.alt">*:*</str>
+      <str name="mm">6&lt;-1 6&lt;90%</str>
+      <int name="qs">1</int>
+      <int name="ps">2</int>
       <float name="tie">0.01</float>
-      <str name="qf_dismax">id^0.8 id_t^0.8 title_t^0.3 mods_t^0.2</str>
-      <str name="pf_dismax">id^0.9 id_t^0.9 title_t^0.5 mods_t^0.2</str>
-      <str name="fl"> *, score</str>
-      <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-      <int name="ps">100</int>
+      <bool name="lowercaseOperators">true</bool>
+
+      <str name="qf">
+        sw_display_title_tesim^5
+        contributor_text_nostem_im^3
+        topic_tesim^2
+
+        tag_text_unstemmed_sim
+
+        originInfo_place_placeTerm_tesim
+        originInfo_publisher_tesim
+
+        content_type_ssim
+        sw_format_ssim
+        object_type_ssim
+
+        descriptive_text_nostem_i
+        descriptive_tiv
+        descriptive_teiv
+
+        collection_title_tesim
+
+        id
+        objectId_tesim
+        obj_label_tesim
+        identifier_ssim
+        identifier_tesim
+        barcode_id_ssim
+        folio_instance_hrid_ssim
+        source_id_text_nostem_i^3
+        source_id_ssi
+        previous_ils_ids_ssim
+        doi_ssim
+        contributor_orcids_ssim
+      </str>
+      <str name="pf">  <!-- (defType dismax, edismax: phrase boost within result set) -->
+        sw_display_title_tesim^25
+        contributor_text_nostem_im^15
+        topic_tesim^10
+
+        descriptive_text_nostem_i^5
+        descriptive_tiv^3
+        descriptive_teiv^2
+
+        collection_title_tesim^5
+
+        objectId_tesim^5
+        obj_label_tesim^5
+        identifier_tesim^5
+        source_id_text_nostem_i^5
+      </str>
+      <str name="pf3">  <!-- (defType edismax: token trigrams boost within result set) -->
+        sw_display_title_tesim^15
+        contributor_text_nostem_im^9
+        topic_tesim^6
+
+        descriptive_text_nostem_i^15
+        descriptive_tiv^9
+        descriptive_teiv^6
+
+        collection_title_tesim^3
+
+        objectId_tesim^3
+        obj_label_tesim^3
+        identifier_tesim^3
+        source_id_text_nostem_i^3
+      </str>
+      <str name="pf2"> <!--(defType edismax: token bigrams boost within result set) -->
+        sw_display_title_tesim^10
+        contributor_text_nostem_im^6
+        topic_tesim^4
+
+        descriptive_text_nostem_i^10
+        descriptive_tiv^6
+        descriptive_teiv^4
+
+        collection_title_tesim^2
+
+        objectId_tesim^2
+        obj_label_tesim^2
+        identifier_tesim^2
+        source_id_text_nostem_i^2
+      </str>
+
+      <str name="facet">true</str>
+      <str name="facet.mincount">1</str>
+      <str name="facet.limit">10</str>
+      <str name="facet.field">exploded_project_tag_ssim</str>
+      <str name="facet.field">exploded_nonproject_tag_ssim</str>
+      <str name="facet.field">objectType_ssim</str>
+      <str name="f.objectType_ssim.facet.sort">index</str>
+      <str name="f.objectType_ssim.facet.method">enum</str>
+      <str name="facet.field">content_type_ssim</str>
+      <str name="f.content_type_ssim.facet.sort">index</str>
+      <str name="f.content_type_ssim.facet.method">enum</str>
+      <str name="facet.field">collection_title_ssim</str>
+      <str name="facet.field">nonhydrus_apo_title_ssim</str>
+      <str name="facet.field">contributor_orcids_ssim</str>
+      <str name="facet.field">wf_wps_ssim</str>
+      <str name="facet.field">wf_wsp_ssim</str>
+      <str name="facet.field">wf_swp_ssim</str>
+      <str name="facet.field">doi_ssim</str>
+      <str name="facet.field">barcode_id_ssim</str>
+      <str name="facet.field">content_file_roles_ssim</str>
+      <str name="f.content_file_roles_ssim.facet.sort">index</str>
+      <str name="f.content_file_roles_ssim.facet.method">enum</str>
+      <str name="facet.field">rights_descriptions_ssim</str>
+      <str name="f.rights_descriptions_ssim.facet.sort">index</str>
+      <str name="f.rights_descriptions_ssim.facet.method">enum</str>
+      <str name="facet.field">use_license_machine_ssi</str>
+      <str name="f.use_license_machine_ssi.facet.sort">index</str>
+      <str name="f.use_license_machine_ssi.facet.method">enum</str>
+      <str name="facet.field">processing_status_text_ssi</str>
+      <str name="f.processing_status_text_ssi.facet.method">enum</str>
+      <str name="facet.field">metadata_source_ssim</str>
+      <str name="f.metadata_source_ssim.facet.method">enum</str>
     </lst>
   </requestHandler>
 
   <requestHandler name="standard" class="solr.SearchHandler">
-     <lst name="defaults">
-       <str name="echoParams">explicit</str>
-       <str name="defType">lucene</str>
-     </lst>
+    <lst name="defaults">
+      <str name="echoParams">explicit</str>
+      <str name="defType">lucene</str>
+    </lst>
   </requestHandler>
 
   <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
@@ -115,19 +277,6 @@
     </lst>
   </requestHandler>
 
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-    <str name="queryAnalyzerFieldType">textSpell</str>
-    <!-- Multiple "Spell Checkers" can be declared and used by this component
-      (e.g. for title_spell field)
-      -->
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">spell</str>
-      <str name="spellcheckIndexDir">./spell</str>
-      <str name="buildOnOptimize">true</str>
-    </lst>
-  </searchComponent>
-
   <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
 
   <requestHandler name="/get" class="solr.RealTimeGetHandler">
@@ -143,7 +292,6 @@
   <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
   <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
 
-
   <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
     <lst name="invariants">
       <str name="q">solrpingquery</str>
@@ -153,9 +301,8 @@
     </lst>
   </requestHandler>
 
-  <!-- config for the admin interface -->
+  <!-- for the admin interface -->
   <admin>
     <defaultQuery>search</defaultQuery>
   </admin>
-
 </config>