diff --git a/_template/_conf/schema.xml b/_template/_conf/schema.xml
index 50e7973..749f315 100644
--- a/_template/_conf/schema.xml
+++ b/_template/_conf/schema.xml
@@ -11,10 +11,10 @@
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
   <!-- These are the fields from the "artist" core; edit as needed -->
-  <field name="alias" type="text_multi" indexed="true" stored="true" multiValued="true" />
+  <field name="alias" type="text_multi" indexed="true" stored="false" multiValued="true" />
   <field name="area" type="text_multi" indexed="true" stored="false" multiValued="true" />
   <field name="arid" type="mbid" indexed="true" stored="false" />
-  <field name="artist" type="text" indexed="true" stored="true" />
+  <field name="artist" type="text" indexed="true" stored="false" />
   <field name="artistaccent" type="keep_accents" indexed="true" stored="false" />
   <field name="begin" type="date" indexed="true" stored="false" />
   <field name="beginarea" type="text_multi" indexed="true" stored="false" multiValued="true" />
@@ -30,7 +30,7 @@
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
   <!-- copies name exactly as it appears in the database, so it may be diverted into analysis for
        "artist" and "artistaccent"-->
-  <field name="name" type="string" indexed="true" stored="true" />
+  <field name="name" type="string" indexed="true" stored="false" />
   <field name="names" type="text_multi" indexed="true" stored="false" multiValued="true" />
   <field name="sortname" type="text" indexed="true" stored="false" required="true" />
   <field name="tag" type="text_multi" indexed="true" stored="false" multiValued="true" />
diff --git a/annotation/conf/schema.xml b/annotation/conf/schema.xml
index 54b1fb7..f1246b2 100644
--- a/annotation/conf/schema.xml
+++ b/annotation/conf/schema.xml
@@ -6,18 +6,12 @@
       cores, and since all avaliable field types are linked to each core (for simplicity) we need to
       enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="entity" type="mbid" indexed="true" stored="true" />
+  <field name="entity" type="mbid" indexed="true" stored="false" />
   <!-- id needs to be indexed because it's the unique key -->
   <field name="id" type="string" indexed="true" stored="true" required="true" />
-  <field name="name" type="text" indexed="true" stored="true" />
-  <field name="text" type="text" indexed="true" stored="true" />
-  <field name="type" type="string" indexed="true" stored="true" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-      in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <copyField source="text" dest="catch" />
-  <copyField source="name" dest="catch" />
-  <copyField source="type" dest="catch" />
+  <field name="name" type="text" indexed="true" stored="false" />
+  <field name="text" type="text" indexed="true" stored="false" />
+  <field name="type" type="string" indexed="true" stored="false" />
   <!-- Holds data for reponse writer -->
   <field name="_store" type="storefield" indexed="false" stored="true" />
   <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
diff --git a/area/conf/schema.xml b/area/conf/schema.xml
index de3bea5..b422415 100644
--- a/area/conf/schema.xml
+++ b/area/conf/schema.xml
@@ -8,11 +8,8 @@
   <similarity class="solr.SchemaSimilarityFactory" />
   <field name="aid" type="mbid" indexed="true" stored="false" />
   <field name="alias" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <field name="area" type="text" indexed="true" stored="true" required="true" />
+  <field name="area" type="text" indexed="true" stored="false" required="true" />
   <field name="begin" type="date" indexed="true" stored="false" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="comment" type="text" indexed="true" stored="false" />
   <field name="end" type="date" indexed="true" stored="false" />
   <field name="ended" type="bool" indexed="true" stored="false" />
@@ -28,7 +25,7 @@
     languages sort names differently.  Thus sortname is multiValued. -->
   <field name="sortname" type="text" indexed="true" stored="false" multiValued="true" />
   <field name="tag" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <field name="type" type="lowercase" indexed="true" stored="true" omitNorms="true" />
+  <field name="type" type="lowercase" indexed="true" stored="false" omitNorms="true" />
   <!-- Holds data for reponse writer -->
   <field name="_store" type="storefield" indexed="false" stored="true" />
   <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
@@ -38,9 +35,6 @@
   <copyField source="iso1" dest="iso" />
   <copyField source="iso2" dest="iso" />
   <copyField source="iso3" dest="iso" />
-  <copyField source="area" dest="catch" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="sortname" dest="catch" />
   <copyField source="area" dest="ngram" />
   <copyField source="sortname" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
diff --git a/artist/conf/schema.xml b/artist/conf/schema.xml
index 86bceb8..662943c 100644
--- a/artist/conf/schema.xml
+++ b/artist/conf/schema.xml
@@ -6,15 +6,13 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="alias" type="text_mult_alias_similarity" indexed="true" stored="true" multiValued="true" />
+  <field name="alias" type="text_mult_alias_similarity" indexed="true" stored="false" multiValued="true" />
   <field name="area" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="arid" type="mbid" indexed="true" stored="false" />
-  <field name="artist" type="text" indexed="true" stored="true" />
+  <field name="artist" type="text" indexed="true" stored="false" />
   <field name="artistaccent" type="keep_accents" indexed="true" stored="false" />
   <field name="begin" type="date" indexed="true" stored="false" />
   <field name="beginarea" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <!-- a "catch all" field used as the default search field -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="comment" type="text" indexed="true" stored="false" />
   <field name="country" type="lowercase" indexed="true" stored="false" omitNorms="true" />
   <field name="end" type="date" indexed="true" stored="false" />
@@ -36,9 +34,6 @@
   <field name="_version_" type="long" indexed="true" stored="true" />
   <copyField source="artist" dest="artistaccent" />
   <copyField source="mbid" dest="arid" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="artist" dest="catch" />
-  <copyField source="sortname" dest="catch" />
   <copyField source="artist" dest="ngram" />
   <copyField source="sortname" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
diff --git a/cdstub/conf/schema.xml b/cdstub/conf/schema.xml
index a7e2be0..975b217 100644
--- a/cdstub/conf/schema.xml
+++ b/cdstub/conf/schema.xml
@@ -6,16 +6,16 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="added" type="date" indexed="true" stored="true" />
-  <field name="artist" type="text" indexed="true" stored="true" />
-  <field name="barcode" type="strip_leading_zeroes" indexed="true" stored="true" omitNorms="true" />
-  <field name="comment" type="text" indexed="true" stored="true" />
-  <field name="discid" type="string" indexed="true" stored="true" required="true" />
+  <field name="added" type="date" indexed="true" stored="false" />
+  <field name="artist" type="text" indexed="true" stored="false" />
+  <field name="barcode" type="strip_leading_zeroes" indexed="true" stored="false" omitNorms="true" />
+  <field name="comment" type="text" indexed="true" stored="false" />
+  <field name="discid" type="string" indexed="true" stored="false" required="true" />
   <!-- id needs to be indexed because it's the unique key -->
   <field name="id" type="string" indexed="true" stored="true" required="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
-  <field name="title" type="title" indexed="true" stored="true" required="true" />
-  <field name="tracks" type="int" indexed="true" stored="true" />
+  <field name="title" type="title" indexed="true" stored="false" required="true" />
+  <field name="tracks" type="int" indexed="true" stored="false" />
   <!-- Holds data for reponse writer -->
   <field name="_store" type="storefield" indexed="false" stored="true" />
   <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
diff --git a/editor/conf/schema.xml b/editor/conf/schema.xml
index 6f9bd91..1c88000 100644
--- a/editor/conf/schema.xml
+++ b/editor/conf/schema.xml
@@ -6,8 +6,8 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="bio" type="text" indexed="true" stored="true" />
-  <field name="editor" type="text" indexed="true" stored="true" required="true" />
+  <field name="bio" type="text" indexed="true" stored="false" />
+  <field name="editor" type="text" indexed="true" stored="false" required="true" />
   <field name="id" type="string" indexed="true" stored="true" required="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <!-- Holds data for reponse writer -->
diff --git a/event/conf/schema.xml b/event/conf/schema.xml
index 9582d8a..c2b15c5 100644
--- a/event/conf/schema.xml
+++ b/event/conf/schema.xml
@@ -6,23 +6,20 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="alias" type="text_mult" indexed="true" stored="true" multiValued="true" />
+  <field name="alias" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="aid" type="mbid" indexed="true" stored="false" multiValued="true" />
   <field name="area" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="arid" type="mbid" indexed="true" stored="false" multiValued="true" />
   <field name="artist" type="text" indexed="true" stored="false" multiValued="true" />
   <field name="begin" type="date" indexed="true" stored="false" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="comment" type="text" indexed="true" stored="false" />
   <field name="end" type="date" indexed="true" stored="false" />
   <field name="ended" type="bool" indexed="true" stored="false" />
   <field name="eid" type="mbid" indexed="true" stored="false" />
-  <field name="event" type="text" indexed="true" stored="true" />
+  <field name="event" type="text" indexed="true" stored="false" />
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
-  <field name="name" type="string" indexed="true" stored="true" />
+  <field name="name" type="string" indexed="true" stored="false" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <field name="pid" type="mbid" indexed="true" stored="false" multiValued="true" />
   <field name="place" type="text" indexed="true" stored="false" multiValued="true" />
@@ -35,9 +32,6 @@
   <field name="_version_" type="long" indexed="true" stored="true" />
   <copyField source="mbid" dest="eid" />
   <copyField source="name" dest="event" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="artist" dest="catch" />
-  <copyField source="name" dest="catch" />
   <copyField source="name" dest="ngram" />
   <copyField source="artist" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
diff --git a/instrument/conf/schema.xml b/instrument/conf/schema.xml
index 67e06ed..51f4a27 100644
--- a/instrument/conf/schema.xml
+++ b/instrument/conf/schema.xml
@@ -6,14 +6,11 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="alias" type="text_mult" indexed="true" stored="true" multiValued="true" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
+  <field name="alias" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="comment" type="text" indexed="true" stored="false" />
   <field name="description" type="text" indexed="true" stored="false" />
   <field name="iid" type="mbid" indexed="true" stored="false" />
-  <field name="instrument" type="text" indexed="true" stored="true" />
+  <field name="instrument" type="text" indexed="true" stored="false" />
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
@@ -24,9 +21,6 @@
   <!-- If you remove this field, you must _also_ disable the update log in solrconfig.xml
      or Solr won't start. _version_ and update log are required for SolrCloud. -->
   <field name="_version_" type="long" indexed="true" stored="true" />
-  <copyField source="instrument" dest="catch" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="description" dest="catch" />
   <copyField source="mbid" dest="iid" />
   <copyField source="instrument" dest="ngram" />
   <copyField source="alias" dest="ngram" />
diff --git a/label/conf/schema.xml b/label/conf/schema.xml
index d903626..4ba46d2 100644
--- a/label/conf/schema.xml
+++ b/label/conf/schema.xml
@@ -6,26 +6,23 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="alias" type="text_mult_alias_similarity" indexed="true" stored="true" multiValued="true" />
-  <field name="area" type="text_mult" indexed="true" stored="true" multiValued="true" />
+  <field name="alias" type="text_mult_alias_similarity" indexed="true" stored="false" multiValued="true" />
+  <field name="area" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="begin" type="date" indexed="true" stored="false" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="code" type="strip_leading_zeroes_mult" indexed="true" stored="false" multiValued="true" />
   <field name="comment" type="text" indexed="true" stored="false" />
   <field name="country" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="end" type="date" indexed="true" stored="false" />
-  <field name="ended" type="bool" indexed="true" stored="true" />
-  <field name="ipi" type="string" indexed="true" stored="true" multiValued="true" />
-  <field name="label" type="text" indexed="true" stored="true" />
+  <field name="ended" type="bool" indexed="true" stored="false" />
+  <field name="ipi" type="string" indexed="true" stored="false" multiValued="true" />
+  <field name="label" type="text" indexed="true" stored="false" />
   <field name="labelaccent" type="keep_accents" indexed="true" stored="false" />
-  <field name="laid" type="mbid" indexed="true" stored="true" required="true" />
+  <field name="laid" type="mbid" indexed="true" stored="false" required="true" />
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
   <!-- copies name exactly as it appears in the database, so it may be diverted into analysis for
        "label" and "labelaccent"-->
-  <field name="name" type="string" indexed="true" stored="true" />
+  <field name="name" type="string" indexed="true" stored="false" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <field name="release_count" type="int" indexed="true" stored="false" />
   <field name="sortname" type="text_mult" indexed="true" stored="false" multiValued="true" />
@@ -39,9 +36,6 @@
   <copyField source="name" dest="label" />
   <copyField source="name" dest="labelaccent" />
   <copyField source="mbid" dest="laid" />
-  <copyField source="name" dest="catch" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="sortname" dest="catch" />
   <copyField source="name" dest="ngram" />
   <copyField source="sortname" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
diff --git a/place/conf/schema.xml b/place/conf/schema.xml
index 88b7135..a00630f 100644
--- a/place/conf/schema.xml
+++ b/place/conf/schema.xml
@@ -6,23 +6,20 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="address" type="text" indexed="true" stored="true" />
+  <field name="address" type="text" indexed="true" stored="false" />
   <field name="alias" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="area" type="text" indexed="true" stored="false" multiValued="true" />
-  <field name="begin" type="date" indexed="true" stored="true" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
+  <field name="begin" type="date" indexed="true" stored="false" />
   <field name="comment" type="text" indexed="true" stored="false" />
-  <field name="end" type="date" indexed="true" stored="true" />
+  <field name="end" type="date" indexed="true" stored="false" />
   <field name="ended" type="bool" indexed="true" stored="false" />
-  <field name="lat" type="float" indexed="true" stored="true" />
-  <field name="long" type="float" indexed="true" stored="true" />
+  <field name="lat" type="float" indexed="true" stored="false" />
+  <field name="long" type="float" indexed="true" stored="false" />
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
-  <field name="place" type="text" indexed="true" stored="true" required="true" />
-  <field name="pid" type="mbid" indexed="true" stored="true" />
+  <field name="place" type="text" indexed="true" stored="false" required="true" />
+  <field name="pid" type="mbid" indexed="true" stored="false" />
   <field name="type" type="lowercase" indexed="true" stored="false" omitNorms="true" />
   <!-- Holds data for reponse writer -->
   <field name="_store" type="storefield" indexed="false" stored="true" />
@@ -30,10 +27,6 @@
      or Solr won't start. _version_ and update log are required for SolrCloud. -->
   <field name="_version_" type="long" indexed="true" stored="true" />
   <copyField source="mbid" dest="pid" />
-  <copyField source="place" dest="catch" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="address" dest="catch" />
-  <copyField source="area" dest="catch" />
   <copyField source="place" dest="ngram" />
   <copyField source="alias" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
diff --git a/recording/conf/schema.xml b/recording/conf/schema.xml
index 3e8e4e3..1255db3 100644
--- a/recording/conf/schema.xml
+++ b/recording/conf/schema.xml
@@ -19,12 +19,12 @@
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
   <field name="number" type="string" indexed="true" stored="false" multiValued="true" />
-  <field name="name" type="string" indexed="true" stored="true" required="true" />
+  <field name="name" type="string" indexed="true" stored="false" required="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <field name="position" type="int" indexed="true" stored="false" multiValued="true" />
   <field name="primarytype" type="lowercase_mult" indexed="true" stored="false" multiValued="true" />
   <field name="qdur" type="long" indexed="true" stored="false" />
-  <field name="recording" type="text" indexed="true" stored="true" multiValued="true" />
+  <field name="recording" type="text" indexed="true" stored="false" multiValued="true" />
   <field name="recordingaccent" type="keep_accents" indexed="true" stored="false" />
   <field name="reid" type="mbid" indexed="true" stored="false" multiValued="true" />
   <field name="release" type="title_mult_release_similarity" indexed="true" stored="false" multiValued="true" />
@@ -34,7 +34,7 @@
   <field name="status" type="lowercase_mult" indexed="true" stored="false" multiValued="true" />
   <field name="tag" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="tid" type="mbid" indexed="true" stored="false" multiValued="true" />
-  <field name="tnum" type="int" indexed="true" stored="true" multiValued="true" />
+  <field name="tnum" type="int" indexed="true" stored="false" multiValued="true" />
   <field name="tracks" type="int" indexed="true" stored="false" multiValued="true" />
   <field name="tracksrelease" type="int" indexed="true" stored="false" multiValued="true" />
   <field name="type" type="lowercase_mult" indexed="true" stored="false" multiValued="true" />
diff --git a/release-group/conf/schema.xml b/release-group/conf/schema.xml
index 49170dc..e8d060c 100644
--- a/release-group/conf/schema.xml
+++ b/release-group/conf/schema.xml
@@ -6,28 +6,28 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="arid" type="mbid" indexed="true" stored="true" multiValued="true" />
+  <field name="arid" type="mbid" indexed="true" stored="false" multiValued="true" />
   <field name="artist" type="text_mult" indexed="true" stored="false" />
   <field name="artistname" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <field name="comment" type="text" indexed="true" stored="true" />
+  <field name="comment" type="text" indexed="true" stored="false" />
   <field name="creditname" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
-  <field name="name" type="string" indexed="false" stored="true" />
-  <field name="primarytype" type="lowercase" indexed="true" stored="true" />
+  <field name="name" type="string" indexed="false" stored="false" />
+  <field name="primarytype" type="lowercase" indexed="true" stored="false" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <!-- releases in this release group -->
-  <field name="reid" type="mbid" indexed="true" stored="true" multiValued="true" />
-  <field name="release" type="title_mult_release_similarity" indexed="true" stored="true" multiValued="true" />
-  <field name="releasegroup" type="title" indexed="true" stored="true" required="true" />
+  <field name="reid" type="mbid" indexed="true" stored="false" multiValued="true" />
+  <field name="release" type="title_mult_release_similarity" indexed="true" stored="false" multiValued="true" />
+  <field name="releasegroup" type="title" indexed="true" stored="false" required="true" />
   <field name="releasegroupaccent" type="title_keep_accents" indexed="true" stored="false" />
   <!-- some release groups don't contain releases -->
-  <field name="releases" type="int" indexed="true" stored="true" />
-  <field name="rgid" type="mbid" indexed="true" stored="true" />
-  <field name="secondarytype" type="lowercase_mult" indexed="true" stored="true" multiValued="true" />
-  <field name="status" type="lowercase_mult" indexed="true" stored="true" multiValued="true" omitNorms="true" />
-  <field name="tag" type="text_mult" indexed="true" stored="true" multiValued="true" />
-  <field name="type" type="lowercase_mult" indexed="true" stored="true" multiValued="true" omitNorms="true" />
+  <field name="releases" type="int" indexed="true" stored="false" />
+  <field name="rgid" type="mbid" indexed="true" stored="false" />
+  <field name="secondarytype" type="lowercase_mult" indexed="true" stored="false" multiValued="true" />
+  <field name="status" type="lowercase_mult" indexed="true" stored="false" multiValued="true" omitNorms="true" />
+  <field name="tag" type="text_mult" indexed="true" stored="false" multiValued="true" />
+  <field name="type" type="lowercase_mult" indexed="true" stored="false" multiValued="true" omitNorms="true" />
   <field name="_store" type="storefield" indexed="false" stored="true" />
   <field name="_version_" type="long" indexed="true" stored="true" />
   <copyField source="mbid" dest="rgid" />
diff --git a/release/conf/schema.xml b/release/conf/schema.xml
index d8e16d7..0621fc1 100644
--- a/release/conf/schema.xml
+++ b/release/conf/schema.xml
@@ -11,8 +11,6 @@
   <field name="artistname" type="text_mult" indexed="true" stored="false" multiValued="true" required="true" />
   <field name="asin" type="lowercase" indexed="true" stored="false" multiValued="true" />
   <field name="barcode" type="strip_leading_zeroes" indexed="true" stored="false" />
-  <!-- a "catch all" field used as the default search field -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="catno" type="strip_spaces_and_separators" indexed="true" stored="false" multiValued="true" />
   <field name="comment" type="text" indexed="true" stored="false" />
   <field name="country" type="lowercase" indexed="true" stored="false" multiValued="true" />
@@ -29,12 +27,12 @@
   <field name="mediums" type="int" indexed="true" stored="false" />
   <!-- copies name exactly as it appears in the database, so it may be diverted into analysis for
        "release" and "releaseaccent"-->
-  <field name="name" type="string" indexed="false" stored="true" multiValued="true" />
+  <field name="name" type="string" indexed="false" stored="false" multiValued="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <field name="primarytype" type="lowercase" indexed="true" stored="false" />
   <field name="quality" type="lowercase" indexed="true" stored="false" />
-  <field name="reid" type="mbid" indexed="true" stored="true" />
-  <field name="release" type="title" indexed="true" stored="true" required="true" />
+  <field name="reid" type="mbid" indexed="true" stored="false" />
+  <field name="release" type="title" indexed="true" stored="false" required="true" />
   <field name="releaseaccent" type="title_keep_accents" indexed="true" stored="false" />
   <field name="rgid" type="mbid" indexed="true" stored="false" multiValued="true" />
   <field name="script" type="lowercase" indexed="true" stored="false" />
@@ -54,7 +52,6 @@
   <copyField source="mbid" dest="reid" />
   <copyField source="primarytype" dest="type" />
   <copyField source="secondarytype" dest="type" />
-  <copyField source="name" dest="catch" />
   <copyField source="name" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
   <uniqueKey>mbid</uniqueKey>
diff --git a/series/conf/schema.xml b/series/conf/schema.xml
index 56103da..3a71eb0 100644
--- a/series/conf/schema.xml
+++ b/series/conf/schema.xml
@@ -7,22 +7,17 @@
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
   <field name="alias" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="comment" type="text" indexed="true" stored="false" />
   <field name="orderingattribute" type="lowercase" indexed="true" stored="false" />
   <!-- id needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
-  <field name="series" type="text" indexed="true" stored="true" required="true" />
-  <field name="sid" type="mbid" indexed="true" stored="true" />
+  <field name="series" type="text" indexed="true" stored="false" required="true" />
+  <field name="sid" type="mbid" indexed="true" stored="false" />
   <field name="tag" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="type" type="lowercase" indexed="true" stored="false" omitNorms="true" />
   <field name="_store" type="storefield" indexed="false" stored="true" />
   <field name="_version_" type="long" indexed="true" stored="true" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="series" dest="catch" />
   <copyField source="mbid" dest="sid" />
   <copyField source="alias" dest="ngram" />
   <copyField source="series" dest="ngram" />
diff --git a/tag/conf/schema.xml b/tag/conf/schema.xml
index a3491bb..649412b 100644
--- a/tag/conf/schema.xml
+++ b/tag/conf/schema.xml
@@ -6,17 +6,12 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <!-- id needs to be indexed because it's the unique key -->
   <field name="id" type="string" indexed="true" stored="true" required="true" />
-  <field name="tag" type="text" indexed="true" stored="true" />
+  <field name="tag" type="text" indexed="true" stored="false" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <field name="_store" type="storefield" indexed="false" stored="true" />
   <field name="_version_" type="long" indexed="true" stored="true" />
-  <copyField source="id" dest="catch" />
-  <copyField source="tag" dest="catch" />
   <copyField source="tag" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
   <uniqueKey>id</uniqueKey>
diff --git a/url/conf/schema.xml b/url/conf/schema.xml
index 0aa4b3c..bd1f9b7 100644
--- a/url/conf/schema.xml
+++ b/url/conf/schema.xml
@@ -9,17 +9,14 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="string_mult" indexed="true" stored="false" multiValued="true" />
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
-  <field name="relationtype" type="lowercase" indexed="true" stored="true" omitNorms="true" multiValued="true" />
-  <field name="targetid" type="string" indexed="true" stored="true" multiValued="true" />
-  <field name="targettype" type="lowercase" indexed="true" stored="true" multiValued="true" />
+  <field name="relationtype" type="lowercase" indexed="true" stored="false" omitNorms="true" multiValued="true" />
+  <field name="targetid" type="string" indexed="true" stored="false" multiValued="true" />
+  <field name="targettype" type="lowercase" indexed="true" stored="false" multiValued="true" />
   <field name="uid" type="mbid" indexed="true" stored="false" />
-  <field name="url" type="string" indexed="true" stored="true" />
+  <field name="url" type="string" indexed="true" stored="false" />
   <!-- queries for paths match documents at that path, or in ancestor paths -->
   <field name="url_ancestor" type="ancestor_path" indexed="true" stored="false" />
   <!-- queries for paths match documents at that path, or in descendent paths -->
@@ -32,7 +29,6 @@
   <copyField source="mbid" dest="uid" />
   <copyField source="url" dest="url_ancestor" />
   <copyField source="url" dest="url_descendent" />
-  <copyField source="url" dest="catch" />
   <copyField source="url" dest="ngram" />
   <!-- field to use to determine and enforce document uniqueness. -->
   <uniqueKey>mbid</uniqueKey>
diff --git a/work/conf/schema.xml b/work/conf/schema.xml
index 25dc665..add167e 100644
--- a/work/conf/schema.xml
+++ b/work/conf/schema.xml
@@ -6,33 +6,28 @@
     cores, and since all avaliable field types are linked to each core (for simplicity) we need to
     enable per-field similarity in all cores -->
   <similarity class="solr.SchemaSimilarityFactory" />
-  <field name="alias" type="text_mult" indexed="true" stored="true" multiValued="true" />
-  <field name="arid" type="mbid" indexed="true" stored="true" multiValued="true" />
+  <field name="alias" type="text_mult" indexed="true" stored="false" multiValued="true" />
+  <field name="arid" type="mbid" indexed="true" stored="false" multiValued="true" />
   <field name="artist" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <!-- catch is a catch-all field used as the default search field used when no field is specified
-    in the "Indexed search with advanced query syntax" search field. -->
-  <field name="catch" type="text_mult" indexed="true" stored="false" multiValued="true" />
-  <field name="comment" type="text" indexed="true" stored="true" />
-  <field name="iswc" type="lowercase_mult" indexed="true" stored="true" multiValued="true" omitNorms="true" />
-  <field name="lang" type="lowercase" indexed="true" stored="true" multiValued="true" />
+  <field name="comment" type="text" indexed="true" stored="false" />
+  <field name="iswc" type="lowercase_mult" indexed="true" stored="false" multiValued="true" omitNorms="true" />
+  <field name="lang" type="lowercase" indexed="true" stored="false" multiValued="true" />
   <!-- mbid needs to be indexed because it's the unique key -->
   <field name="mbid" type="mbid" indexed="true" stored="true" required="true" />
-  <field name="name" type="string" indexed="false" stored="true" />
+  <field name="name" type="string" indexed="false" stored="false" />
   <field name="ngram" type="ngram" indexed="true" stored="false" multiValued="true" />
   <field name="recording" type="text_mult" indexed="true" stored="false" multiValued="true" />
   <field name="recording_count" type="int" indexed="true" stored="false" />
-  <field name="rid" type="mbid" indexed="true" stored="true" multiValued="true" />
-  <field name="tag" type="text_mult" indexed="true" stored="true" multiValued="true" />
-  <field name="type" type="lowercase" indexed="true" stored="true" omitNorms="true" />
+  <field name="rid" type="mbid" indexed="true" stored="false" multiValued="true" />
+  <field name="tag" type="text_mult" indexed="true" stored="false" multiValued="true" />
+  <field name="type" type="lowercase" indexed="true" stored="false" omitNorms="true" />
   <field name="wid" type="mbid" indexed="true" stored="false" />
-  <field name="work" type="title" indexed="true" stored="true" required="true" />
+  <field name="work" type="title" indexed="true" stored="false" required="true" />
   <field name="workaccent" type="title_keep_accents" indexed="true" stored="false" required="true" />
   <field name="_store" type="storefield" indexed="false" stored="true" />
   <field name="_version_" type="long" indexed="true" stored="true" />
   <copyField source="name" dest="work" />
   <copyField source="name" dest="workaccent" />
-  <copyField source="alias" dest="catch" />
-  <copyField source="work" dest="catch" />
   <copyField source="mbid" dest="wid" />
   <copyField source="alias" dest="ngram" />
   <copyField source="work" dest="ngram" />