diff --git a/.travis.yml b/.travis.yml
index d06d146..0383c06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: java
-jdk: oraclejdk8
+jdk: openjdk8
 install: mvn install -DskipTests=true
 script: mvn test -pl index-data-converter
diff --git a/solr-config/core/conf/schema.xml b/solr-config/core/conf/schema.xml
index 0b00bb2..fca70c6 100644
--- a/solr-config/core/conf/schema.xml
+++ b/solr-config/core/conf/schema.xml
@@ -290,6 +290,10 @@
         </fieldType>
 
         <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+        <fieldType name="location_grpt" class="solr.RptWithGeometrySpatialField" 
+               distErrPct="0.025"
+               maxDistErr="0.001"
+               distanceUnits="kilometers" />
     </types>
     <fields>
         <!-- general -->
@@ -374,6 +378,7 @@
         <field name="latitude" type="double" indexed="true" stored="true" multiValued="false"/>
         <field name="longitude" type="double" indexed="true" stored="true" multiValued="false"/>
         <field name="location" type="location" indexed="true" stored="true" multiValued="false"/>
+        <field name="location_grpt" type="location_grpt" indexed="true" stored="false" multiValued="false"/>
         <field name="isPromotable" type="boolean" indexed="true" stored="true" multiValued="false" default="false"/>
         <field name="annotatorId" type="string" indexed="true" stored="true" multiValued="false"/>
         <field name="annotatorName" type="string" indexed="true" stored="false" multiValued="false"/>
@@ -654,6 +659,7 @@
     <copyField source="targets" dest="targetNames_ngram"/>
     <copyField source="targets" dest="text"/>
     <copyField source="title" dest="text"/>
+    <copyField source="location" dest="location_grpt"/>
 
     <!-- Copy of fields after language detection into txt_lang fields for multilingual indexing-->
     <!-- Copy of fields after language detection into text field for term expansion-->