diff --git a/solr/geodata-test/schema.xml b/solr/geodata-test/schema.xml
index 107b14b..df25e9a 100644
--- a/solr/geodata-test/schema.xml
+++ b/solr/geodata-test/schema.xml
@@ -155,19 +155,21 @@
   </types>
 
   <!-- for scoring formula -->
-  <copyField source="dct_spatial_sm"     dest="dct_spatial_tmi"     maxChars="10000"/>
-  <copyField source="dct_temporal_sm"    dest="dct_temporal_tmi"    maxChars="10000"/>
-  <copyField source="dct_creator_sm"      dest="dct_creator_tmi"      maxChars="1000"/>
-  <copyField source="dct_description_sm"   dest="dct_description_tmi"   maxChars="10000"/>
-  <copyField source="dct_format_s"        dest="dct_format_ti"        maxChars="100"/>
-  <copyField source="dct_identifier_sm"    dest="dct_identifier_tmi"    maxChars="100"/>
-  <copyField source="dct_publisher_sm"     dest="dct_publisher_tmi"     maxChars="1000"/>
-  <copyField source="dct_accessRights_s"        dest="dct_accessRights_ti"        maxChars="100"/>
-  <copyField source="schema_provider_s"   dest="dct_provider_ti"   maxChars="1000"/>
-  <copyField source="dct_subject_sm"      dest="dct_subject_tmi"      maxChars="10000"/>
-  <copyField source="dct_title_s"         dest="dct_title_ti"         maxChars="1000"/>
-  <copyField source="dct_isPartOf_sm"    dest="dct_isPartOf_tmi"    maxChars="1000"/>
-  <copyField source="id"       dest="layer_slug_ti"       maxChars="100"/>
+  <copyField source="dct_spatial_sm"       dest="dct_spatial_tmi"      maxChars="10000"/>
+  <copyField source="dct_temporal_sm"      dest="dct_temporal_tmi"     maxChars="10000"/>
+  <copyField source="dct_creator_sm"       dest="dct_creator_tmi"      maxChars="1000"/>
+  <copyField source="dct_description_sm"   dest="dct_description_tmi"  maxChars="10000"/>
+  <copyField source="dct_format_s"         dest="dct_format_ti"        maxChars="100"/>
+  <copyField source="dct_identifier_sm"    dest="dct_identifier_tmi"   maxChars="100"/>
+  <copyField source="dct_publisher_sm"     dest="dct_publisher_tmi"    maxChars="1000"/>
+  <copyField source="dct_accessRights_s"   dest="dct_accessRights_ti"  maxChars="100"/>
+  <copyField source="schema_provider_s"    dest="dct_provider_ti"      maxChars="1000"/>
+  <copyField source="dct_subject_sm"       dest="dct_subject_tmi"      maxChars="10000"/>
+  <copyField source="dct_title_s"          dest="dct_title_ti"         maxChars="1000"/>
+  <copyField source="dct_isPartOf_sm"      dest="dct_isPartOf_tmi"     maxChars="1000"/>
+  <copyField source="gbl_resourceClass_sm" dest="gbl_resourceClass_tmi" maxChars="100"/>
+  <copyField source="gbl_resourceType_sm"  dest="gbl_resourceType_tmi"  maxChars="1000"/>
+  <copyField source="id"                   dest="id_ti"                maxChars="100"/>
 
   <!-- core text search -->
   <copyField source="*_s"                dest="text" />
diff --git a/solr/geodata-test/solrconfig.xml b/solr/geodata-test/solrconfig.xml
index bc012ef..10f8df6 100644
--- a/solr/geodata-test/solrconfig.xml
+++ b/solr/geodata-test/solrconfig.xml
@@ -94,7 +94,7 @@
   </query>
 
   <requestDispatcher handleSelect="false">
-    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048"/>
+    <requestParsers multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048"/>
     <httpCaching never304="true"/>
    </requestDispatcher>
 
@@ -127,9 +127,10 @@
         dct_title_ti^6
         dct_accessRights_ti^7
         dct_provider_ti^8
-        layer_geom_type_ti^9
-        layer_slug_ti^10
+        gbl_resourceClass_ti^9
+        gbl_resourceType_ti^9
         dct_identifier_ti^10
+        id_ti^10
       </str>
       <str name="pf"><!-- phrase boost within result set -->
         text^1
@@ -143,9 +144,10 @@
         dct_title_ti^6
         dct_accessRights_ti^7
         dct_provider_ti^8
-        layer_geom_type_ti^9
-        layer_slug_ti^10
+        gbl_resourceClass_ti^9
+        gbl_resourceType_ti^9
         dct_identifier_ti^10
+        id_ti^10
       </str>
       <bool name="facet">true</bool>
       <int name="facet.mincount">1</int>
@@ -182,7 +184,7 @@
          the PingRequestHandler.
          relative paths are resolved against the data dir
       -->
-    <!-- <str name="healthcheckFile">server-enabled.txt</str> -->
+    <str name="healthcheckFile">server-enabled.txt</str>
   </requestHandler>
 
   <requestHandler name="/analysis/field"
diff --git a/solr/geodata/schema.xml b/solr/geodata/schema.xml
index 107b14b..df25e9a 100644
--- a/solr/geodata/schema.xml
+++ b/solr/geodata/schema.xml
@@ -155,19 +155,21 @@
   </types>
 
   <!-- for scoring formula -->
-  <copyField source="dct_spatial_sm"     dest="dct_spatial_tmi"     maxChars="10000"/>
-  <copyField source="dct_temporal_sm"    dest="dct_temporal_tmi"    maxChars="10000"/>
-  <copyField source="dct_creator_sm"      dest="dct_creator_tmi"      maxChars="1000"/>
-  <copyField source="dct_description_sm"   dest="dct_description_tmi"   maxChars="10000"/>
-  <copyField source="dct_format_s"        dest="dct_format_ti"        maxChars="100"/>
-  <copyField source="dct_identifier_sm"    dest="dct_identifier_tmi"    maxChars="100"/>
-  <copyField source="dct_publisher_sm"     dest="dct_publisher_tmi"     maxChars="1000"/>
-  <copyField source="dct_accessRights_s"        dest="dct_accessRights_ti"        maxChars="100"/>
-  <copyField source="schema_provider_s"   dest="dct_provider_ti"   maxChars="1000"/>
-  <copyField source="dct_subject_sm"      dest="dct_subject_tmi"      maxChars="10000"/>
-  <copyField source="dct_title_s"         dest="dct_title_ti"         maxChars="1000"/>
-  <copyField source="dct_isPartOf_sm"    dest="dct_isPartOf_tmi"    maxChars="1000"/>
-  <copyField source="id"       dest="layer_slug_ti"       maxChars="100"/>
+  <copyField source="dct_spatial_sm"       dest="dct_spatial_tmi"      maxChars="10000"/>
+  <copyField source="dct_temporal_sm"      dest="dct_temporal_tmi"     maxChars="10000"/>
+  <copyField source="dct_creator_sm"       dest="dct_creator_tmi"      maxChars="1000"/>
+  <copyField source="dct_description_sm"   dest="dct_description_tmi"  maxChars="10000"/>
+  <copyField source="dct_format_s"         dest="dct_format_ti"        maxChars="100"/>
+  <copyField source="dct_identifier_sm"    dest="dct_identifier_tmi"   maxChars="100"/>
+  <copyField source="dct_publisher_sm"     dest="dct_publisher_tmi"    maxChars="1000"/>
+  <copyField source="dct_accessRights_s"   dest="dct_accessRights_ti"  maxChars="100"/>
+  <copyField source="schema_provider_s"    dest="dct_provider_ti"      maxChars="1000"/>
+  <copyField source="dct_subject_sm"       dest="dct_subject_tmi"      maxChars="10000"/>
+  <copyField source="dct_title_s"          dest="dct_title_ti"         maxChars="1000"/>
+  <copyField source="dct_isPartOf_sm"      dest="dct_isPartOf_tmi"     maxChars="1000"/>
+  <copyField source="gbl_resourceClass_sm" dest="gbl_resourceClass_tmi" maxChars="100"/>
+  <copyField source="gbl_resourceType_sm"  dest="gbl_resourceType_tmi"  maxChars="1000"/>
+  <copyField source="id"                   dest="id_ti"                maxChars="100"/>
 
   <!-- core text search -->
   <copyField source="*_s"                dest="text" />
diff --git a/solr/geodata/solrconfig.xml b/solr/geodata/solrconfig.xml
index bc012ef..10f8df6 100644
--- a/solr/geodata/solrconfig.xml
+++ b/solr/geodata/solrconfig.xml
@@ -94,7 +94,7 @@
   </query>
 
   <requestDispatcher handleSelect="false">
-    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048"/>
+    <requestParsers multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048"/>
     <httpCaching never304="true"/>
    </requestDispatcher>
 
@@ -127,9 +127,10 @@
         dct_title_ti^6
         dct_accessRights_ti^7
         dct_provider_ti^8
-        layer_geom_type_ti^9
-        layer_slug_ti^10
+        gbl_resourceClass_ti^9
+        gbl_resourceType_ti^9
         dct_identifier_ti^10
+        id_ti^10
       </str>
       <str name="pf"><!-- phrase boost within result set -->
         text^1
@@ -143,9 +144,10 @@
         dct_title_ti^6
         dct_accessRights_ti^7
         dct_provider_ti^8
-        layer_geom_type_ti^9
-        layer_slug_ti^10
+        gbl_resourceClass_ti^9
+        gbl_resourceType_ti^9
         dct_identifier_ti^10
+        id_ti^10
       </str>
       <bool name="facet">true</bool>
       <int name="facet.mincount">1</int>
@@ -182,7 +184,7 @@
          the PingRequestHandler.
          relative paths are resolved against the data dir
       -->
-    <!-- <str name="healthcheckFile">server-enabled.txt</str> -->
+    <str name="healthcheckFile">server-enabled.txt</str>
   </requestHandler>
 
   <requestHandler name="/analysis/field"