diff --git a/.travis.yml b/.travis.yml
index bf3d2027..10ec4079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,12 @@ matrix:
 env:
   matrix:
     - ES_VERSION=2.4.6
+    - ES_VERSION=5.6.12
 jdk:
   - oraclejdk8
 install:
   - mkdir /tmp/elasticsearch
-  - wget -O - https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1
-  - /tmp/elasticsearch/bin/plugin install analysis-icu
-  - /tmp/elasticsearch/bin/elasticsearch --daemonize --path.data /tmp
+  - ./scripts/setup_ci.sh
   - npm i
 script:
   - npm run travis
diff --git a/README.md b/README.md
index 74d15962..dc9435b2 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ $ npm run integration
 Download the image and start an elasticsearch docker container:
 
 ```bash
-$ docker run --rm --name elastic-test -p 9200:9200 pelias/elasticsearch
+$ docker run --rm --name elastic-test -p 9200:9200 -e 'discovery.type=single-node' pelias/elasticsearch:5.6.12
 ```
 
 ### Continuous Integration
diff --git a/integration/address_matching.js b/integration/address_matching.js
index c86bca38..8160f1ed 100644
--- a/integration/address_matching.js
+++ b/integration/address_matching.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index some docs
diff --git a/integration/admin_matching.js b/integration/admin_matching.js
index 4a23c45e..37cae3bf 100644
--- a/integration/admin_matching.js
+++ b/integration/admin_matching.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with all admin values
diff --git a/integration/analyzer_peliasAdmin.js b/integration/analyzer_peliasAdmin.js
index 9fdb872e..18efa8ab 100644
--- a/integration/analyzer_peliasAdmin.js
+++ b/integration/analyzer_peliasAdmin.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasAdmin' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -34,7 +34,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasAdmin' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -72,7 +72,7 @@ module.exports.tests.functional = function(test, common){
 module.exports.tests.synonyms = function(test, common){
   test( 'synonyms', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasAdmin' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -99,7 +99,7 @@ module.exports.tests.synonyms = function(test, common){
 module.exports.tests.tokenizer = function(test, common){
   test( 'tokenizer', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasAdmin' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -125,7 +125,7 @@ module.exports.tests.tokenizer = function(test, common){
 module.exports.tests.unicode = function(test, common){
   test( 'normalization', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasAdmin' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/analyzer_peliasHousenumber.js b/integration/analyzer_peliasHousenumber.js
index 9caa2ab5..1e341fe3 100644
--- a/integration/analyzer_peliasHousenumber.js
+++ b/integration/analyzer_peliasHousenumber.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasHousenumber' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -24,7 +24,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasHousenumber' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/analyzer_peliasIndexOneEdgeGram.js b/integration/analyzer_peliasIndexOneEdgeGram.js
index 465a386d..da46111e 100644
--- a/integration/analyzer_peliasIndexOneEdgeGram.js
+++ b/integration/analyzer_peliasIndexOneEdgeGram.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasIndexOneEdgeGram' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -65,7 +65,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.address_suffix_expansions = function(test, common){
   test( 'address suffix expansions', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasIndexOneEdgeGram' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -93,7 +93,7 @@ module.exports.tests.address_suffix_expansions = function(test, common){
 module.exports.tests.stop_words = function(test, common){
   test( 'stop words', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasIndexOneEdgeGram' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -112,7 +112,7 @@ module.exports.tests.stop_words = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasIndexOneEdgeGram' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -135,7 +135,7 @@ module.exports.tests.functional = function(test, common){
 module.exports.tests.address = function(test, common){
   test( 'address', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasIndexOneEdgeGram' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -159,7 +159,7 @@ module.exports.tests.address = function(test, common){
 module.exports.tests.unicode = function(test, common){
   test( 'normalization', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasIndexOneEdgeGram' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/analyzer_peliasPhrase.js b/integration/analyzer_peliasPhrase.js
index fb8b27a6..fe6c9209 100644
--- a/integration/analyzer_peliasPhrase.js
+++ b/integration/analyzer_peliasPhrase.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasPhrase' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -54,7 +54,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasPhrase' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -97,7 +97,7 @@ module.exports.tests.functional = function(test, common){
 module.exports.tests.tokenizer = function(test, common){
   test( 'tokenizer', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasPhrase' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -124,7 +124,7 @@ module.exports.tests.tokenizer = function(test, common){
 module.exports.tests.slop = function(test, common){
   test( 'slop', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasPhrase' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -142,7 +142,7 @@ module.exports.tests.slop = function(test, common){
 module.exports.tests.slop_query = function(test, common){
   test( 'slop query', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasPhrase' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -179,31 +179,27 @@ module.exports.tests.slop_query = function(test, common){
     function buildQuery( i ){
       return {
         "query": {
-          "filtered": {
-            "query": {
-              "bool": {
-                "must": [
-                  {
-                    "match": {
-                      "name.default": {
-                        "query": i
-                      }
-                    }
+          "bool": {
+            "must": [
+              {
+                "match": {
+                  "name.default": {
+                    "query": i
                   }
-                ],
-                "should": [
-                  {
-                    "match": {
-                      "phrase.default": {
-                        "query": i,
-                        "type": "phrase",
-                        "slop": 2
-                      }
-                    }
+                }
+              }
+            ],
+            "should": [
+              {
+                "match": {
+                  "phrase.default": {
+                    "query": i,
+                    "type": "phrase",
+                    "slop": 2
                   }
-                ]
+                }
               }
-            }
+            ]
           }
         }
       };
@@ -213,17 +209,18 @@ module.exports.tests.slop_query = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'mytype',
+        searchType: 'dfs_query_then_fetch',
         body: buildQuery('Lake Cayuga')
       }, function( err, res ){
         t.equal( res.hits.total, 3 );
         var hits = res.hits.hits;
 
         t.equal( hits[0]._source.name.default, 'Lake Cayuga' );
-        t.equal( hits[1]._source.name.default, 'Cayuga Lake' );
-        t.equal( hits[2]._source.name.default, '7991 Lake Cayuga Dr' );
+        t.equal( hits[1]._source.name.default, '7991 Lake Cayuga Dr' );
+        t.equal( hits[2]._source.name.default, 'Cayuga Lake' );
 
-        t.true( hits[0]._score > hits[1]._score );
-        t.true( hits[1]._score > hits[2]._score );
+        t.true( hits[0]._score >= hits[1]._score );
+        t.true( hits[1]._score >= hits[2]._score );
         done();
       });
     });
@@ -236,7 +233,7 @@ module.exports.tests.slop_query = function(test, common){
 module.exports.tests.slop = function(test, common){
   test( 'slop', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document
@@ -257,6 +254,7 @@ module.exports.tests.slop = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
+        searchType: 'dfs_query_then_fetch',
         body: { query: { match: {
           'name.default': {
             'analyzer': 'peliasPhrase',
@@ -280,7 +278,7 @@ module.exports.tests.slop = function(test, common){
 module.exports.tests.unicode = function(test, common){
   test( 'normalization', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasPhrase' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/analyzer_peliasQueryFullToken.js b/integration/analyzer_peliasQueryFullToken.js
index b92112ce..be7984a6 100644
--- a/integration/analyzer_peliasQueryFullToken.js
+++ b/integration/analyzer_peliasQueryFullToken.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryFullToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -54,7 +54,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.address_suffix_expansions = function(test, common){
   test( 'address suffix expansions', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryFullToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -74,7 +74,7 @@ module.exports.tests.address_suffix_expansions = function(test, common){
 module.exports.tests.stop_words = function(test, common){
   test( 'stop words', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryFullToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -89,7 +89,7 @@ module.exports.tests.stop_words = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryFullToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -112,7 +112,7 @@ module.exports.tests.functional = function(test, common){
 module.exports.tests.tokenizer = function(test, common){
   test( 'tokenizer', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryFullToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -135,7 +135,7 @@ module.exports.tests.tokenizer = function(test, common){
 module.exports.tests.slop = function(test, common){
   test( 'slop', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document
@@ -178,7 +178,7 @@ module.exports.tests.slop = function(test, common){
 module.exports.tests.address = function(test, common){
   test( 'address', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryFullToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -202,7 +202,7 @@ module.exports.tests.address = function(test, common){
 module.exports.tests.unicode = function(test, common){
   test( 'normalization', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryFullToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/analyzer_peliasQueryPartialToken.js b/integration/analyzer_peliasQueryPartialToken.js
index 7a24544c..22ef8a6b 100644
--- a/integration/analyzer_peliasQueryPartialToken.js
+++ b/integration/analyzer_peliasQueryPartialToken.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryPartialToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -54,7 +54,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.address_suffix_expansions = function(test, common){
   test( 'address suffix expansions', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryPartialToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -72,7 +72,7 @@ module.exports.tests.address_suffix_expansions = function(test, common){
 module.exports.tests.stop_words = function(test, common){
   test( 'stop words', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryPartialToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -86,7 +86,7 @@ module.exports.tests.stop_words = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryPartialToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -101,7 +101,7 @@ module.exports.tests.functional = function(test, common){
 module.exports.tests.address = function(test, common){
   test( 'address', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryPartialToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -125,7 +125,7 @@ module.exports.tests.address = function(test, common){
 module.exports.tests.unicode = function(test, common){
   test( 'normalization', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasQueryPartialToken' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/analyzer_peliasStreet.js b/integration/analyzer_peliasStreet.js
index 23531111..f739140e 100644
--- a/integration/analyzer_peliasStreet.js
+++ b/integration/analyzer_peliasStreet.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasStreet' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -33,7 +33,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasStreet' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -50,7 +50,7 @@ module.exports.tests.functional = function(test, common){
 module.exports.tests.normalize_punctuation = function(test, common){
   test( 'normalize punctuation', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasStreet' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -66,7 +66,7 @@ module.exports.tests.normalize_punctuation = function(test, common){
 module.exports.tests.remove_ordinals = function(test, common){
   test( 'remove ordinals', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasStreet' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -140,7 +140,7 @@ module.exports.tests.remove_ordinals = function(test, common){
 module.exports.tests.tokenizer = function(test, common){
   test( 'tokenizer', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasStreet' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -163,7 +163,7 @@ module.exports.tests.tokenizer = function(test, common){
 module.exports.tests.unicode = function(test, common){
   test( 'normalization', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasStreet' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/analyzer_peliasZip.js b/integration/analyzer_peliasZip.js
index 8c4563ec..814376fa 100644
--- a/integration/analyzer_peliasZip.js
+++ b/integration/analyzer_peliasZip.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.analyze = function(test, common){
   test( 'analyze', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasZip' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
@@ -25,7 +25,7 @@ module.exports.tests.analyze = function(test, common){
 module.exports.tests.functional = function(test, common){
   test( 'functional', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     var assertAnalysis = analyze.bind( null, suite, t, 'peliasZip' );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
diff --git a/integration/autocomplete_abbreviated_street_names.js b/integration/autocomplete_abbreviated_street_names.js
index 44799636..e5373eab 100644
--- a/integration/autocomplete_abbreviated_street_names.js
+++ b/integration/autocomplete_abbreviated_street_names.js
@@ -15,7 +15,7 @@ module.exports.tests = {};
 module.exports.tests.index_expanded_form_search_contracted = function(test, common){
   test( 'index expanded and retrieve contracted form', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
@@ -68,69 +68,69 @@ module.exports.tests.index_expanded_form_search_contracted = function(test, comm
   });
 };
 
-// index the name as 'Grolmanstr.' and then retrieve with 'Grolmanstraße'
-module.exports.tests.index_contracted_form_search_expanded = function(test, common){
-  test( 'index contracted and search expanded', function(t){
-
-    var suite = new elastictest.Suite( null, { schema: schema } );
-    suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
-
-    // index a document with a name which contains a synonym (center)
-    suite.action( function( done ){
-      suite.client.index({
-        index: suite.props.index,
-        type: 'test',
-        id: '1',
-        body: { name: { default: 'Grolmanstr.' } }
-      }, done);
-    });
-
-    // @note: these tests are commented out, the issue would be better solved
-    // with https://github.com/pelias/openaddresses/pull/68
-
-    //
-    // // search using 'peliasQueryPartialToken'
-    // suite.assert( function( done ){
-    //   suite.client.search({
-    //     index: suite.props.index,
-    //     type: 'test',
-    //     body: { query: { match: {
-    //       'name.default': {
-    //         'analyzer': 'peliasQueryPartialToken',
-    //         'query': 'Grolmanstraße'
-    //       }
-    //     }}}
-    //   }, function( err, res ){
-    //     t.equal( err, undefined );
-    //     t.equal( res.hits.total, 1, 'document found' );
-    //     done();
-    //   });
-    // });
-
-    // search using 'peliasQueryFullToken'
-    // @note: this case is currently not supported.
-    // Please index your data in the expanded form.
-
-    // suite.assert( function( done ){
-    //   suite.client.search({
-    //     index: suite.props.index,
-    //     type: 'test',
-    //     body: { query: { match: {
-    //       'name.default': {
-    //         'analyzer': 'peliasQueryFullToken',
-    //         'query': 'Grolmanstraße'
-    //       }
-    //     }}}
-    //   }, function( err, res ){
-    //     t.equal( err, undefined );
-    //     t.equal( res.hits.total, 1, 'document found' );
-    //     done();
-    //   });
-    // });
-
-    suite.run( t.end );
-  });
-};
+// // index the name as 'Grolmanstr.' and then retrieve with 'Grolmanstraße'
+// module.exports.tests.index_contracted_form_search_expanded = function(test, common){
+//   test( 'index contracted and search expanded', function(t){
+
+//     var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
+//     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
+
+//     // index a document with a name which contains a synonym (center)
+//     suite.action( function( done ){
+//       suite.client.index({
+//         index: suite.props.index,
+//         type: 'test',
+//         id: '1',
+//         body: { name: { default: 'Grolmanstr.' } }
+//       }, done);
+//     });
+
+//     // @note: these tests are commented out, the issue would be better solved
+//     // with https://github.com/pelias/openaddresses/pull/68
+
+//     //
+//     // // search using 'peliasQueryPartialToken'
+//     // suite.assert( function( done ){
+//     //   suite.client.search({
+//     //     index: suite.props.index,
+//     //     type: 'test',
+//     //     body: { query: { match: {
+//     //       'name.default': {
+//     //         'analyzer': 'peliasQueryPartialToken',
+//     //         'query': 'Grolmanstraße'
+//     //       }
+//     //     }}}
+//     //   }, function( err, res ){
+//     //     t.equal( err, undefined );
+//     //     t.equal( res.hits.total, 1, 'document found' );
+//     //     done();
+//     //   });
+//     // });
+
+//     // search using 'peliasQueryFullToken'
+//     // @note: this case is currently not supported.
+//     // Please index your data in the expanded form.
+
+//     // suite.assert( function( done ){
+//     //   suite.client.search({
+//     //     index: suite.props.index,
+//     //     type: 'test',
+//     //     body: { query: { match: {
+//     //       'name.default': {
+//     //         'analyzer': 'peliasQueryFullToken',
+//     //         'query': 'Grolmanstraße'
+//     //       }
+//     //     }}}
+//     //   }, function( err, res ){
+//     //     t.equal( err, undefined );
+//     //     t.equal( res.hits.total, 1, 'document found' );
+//     //     done();
+//     //   });
+//     // });
+
+//     suite.run( t.end );
+//   });
+// };
 
 module.exports.all = function (tape, common) {
 
diff --git a/integration/autocomplete_directional_synonym_expansion.js b/integration/autocomplete_directional_synonym_expansion.js
index 66549a01..230a09ff 100644
--- a/integration/autocomplete_directional_synonym_expansion.js
+++ b/integration/autocomplete_directional_synonym_expansion.js
@@ -15,7 +15,7 @@ module.exports.tests = {};
 module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
   test( 'index and retrieve expanded form', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
@@ -72,7 +72,7 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
 module.exports.tests.index_and_retrieve_contracted_form = function(test, common){
   test( 'index and retrieve contracted form', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
@@ -129,7 +129,7 @@ module.exports.tests.index_and_retrieve_contracted_form = function(test, common)
 module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
   test( 'index and retrieve mixed form 1', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
@@ -186,7 +186,7 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
 module.exports.tests.index_and_retrieve_mixed_form_2 = function(test, common){
   test( 'index and retrieve mixed form 2', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
diff --git a/integration/autocomplete_street_synonym_expansion.js b/integration/autocomplete_street_synonym_expansion.js
index 7adceaff..939304e9 100644
--- a/integration/autocomplete_street_synonym_expansion.js
+++ b/integration/autocomplete_street_synonym_expansion.js
@@ -15,7 +15,7 @@ module.exports.tests = {};
 module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
   test( 'index and retrieve expanded form', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
@@ -72,7 +72,7 @@ module.exports.tests.index_and_retrieve_expanded_form = function(test, common){
 module.exports.tests.index_and_retrieve_contracted_form = function(test, common){
   test( 'index and retrieve contracted form', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
@@ -129,7 +129,7 @@ module.exports.tests.index_and_retrieve_contracted_form = function(test, common)
 module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
   test( 'index and retrieve mixed form 1', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
@@ -186,7 +186,7 @@ module.exports.tests.index_and_retrieve_mixed_form_1 = function(test, common){
 module.exports.tests.index_and_retrieve_mixed_form_2 = function(test, common){
   test( 'index and retrieve mixed form 2', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a name which contains a synonym (center)
diff --git a/integration/bounding_box.js b/integration/bounding_box.js
index a1bb0aef..bde47a73 100644
--- a/integration/bounding_box.js
+++ b/integration/bounding_box.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.index_and_retrieve = function(test, common){
   test( 'index and retrieve', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index a document with a bbox
diff --git a/integration/dynamic_templates.js b/integration/dynamic_templates.js
index 66d6b745..41e27bed 100644
--- a/integration/dynamic_templates.js
+++ b/integration/dynamic_templates.js
@@ -8,14 +8,14 @@ module.exports.tests = {};
 
 // 'admin' mappings have a different 'name' dynamic_template to the other types
 module.exports.tests.dynamic_templates_name = function(test, common){
-  test( 'admin->name', nameAssertion( 'country', 'peliasIndexOneEdgeGram' ) );
-  test( 'document->name', nameAssertion( 'myType', 'peliasIndexOneEdgeGram' ) );
+  test( 'admin->name', nameAssertion( 'country', 'peliasIndexOneEdgeGram', common ) );
+  test( 'document->name', nameAssertion( 'myType', 'peliasIndexOneEdgeGram', common ) );
 };
 
 // all types share the same phrase mapping
 module.exports.tests.dynamic_templates_phrase = function(test, common){
-  test( 'admin->phrase', phraseAssertion( 'country', 'peliasPhrase' ) );
-  test( 'document->phrase', phraseAssertion( 'myType', 'peliasPhrase' ) );
+  test( 'admin->phrase', phraseAssertion( 'country', 'peliasPhrase', common ) );
+  test( 'document->phrase', phraseAssertion( 'myType', 'peliasPhrase', common ) );
 };
 
 module.exports.all = function (tape, common) {
@@ -29,10 +29,10 @@ module.exports.all = function (tape, common) {
   }
 };
 
-function nameAssertion( type, analyzer ){
+function nameAssertion( type, analyzer, common ){
   return function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
 
     // index a document from a normal document layer
     suite.action( function( done ){
@@ -63,10 +63,10 @@ function nameAssertion( type, analyzer ){
   };
 }
 
-function phraseAssertion( type, analyzer ){
+function phraseAssertion( type, analyzer, common ){
   return function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
 
     // index a document from a normal document layer
     suite.action( function( done ){
diff --git a/integration/run.js b/integration/run.js
index 71429277..fde8ef9c 100644
--- a/integration/run.js
+++ b/integration/run.js
@@ -1,5 +1,13 @@
-var tape = require('tape');
-var common = {};
+const tape = require('tape');
+const config = require('pelias-config').generate();
+
+const common = {
+  clientOpts: {
+    host: 'localhost:9200',
+    keepAlive: true,
+    apiVersion: config.esclient.apiVersion
+  }
+};
 
 var tests = [
   require('./validate.js'),
diff --git a/integration/source_layer_sourceid_filtering.js b/integration/source_layer_sourceid_filtering.js
index b05de314..5b2ad72a 100644
--- a/integration/source_layer_sourceid_filtering.js
+++ b/integration/source_layer_sourceid_filtering.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.source_filter = function(test, common){
   test( 'source filter', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
     suite.action( function( done ){ setTimeout( done, 500 ); }); // wait for es to bring some shards up
 
     // index some docs
@@ -47,9 +47,11 @@ module.exports.tests.source_filter = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
-        body: { filter: { bool: { must: [
-          { term: { source: 'osm' } }
-        ]}}}
+        body: { query: {
+          term: {
+            source: 'osm'
+          }
+        }}
       }, function( err, res ){
         t.equal( res.hits.total, 2 );
         done();
@@ -61,9 +63,11 @@ module.exports.tests.source_filter = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
-        body: { filter: { bool: { must: [
-          { term: { layer: 'address' } }
-        ]}}}
+        body: { query: {
+          term: {
+            layer: 'address'
+          }
+        }}
       }, function( err, res ){
         t.equal( res.hits.total, 2 );
         done();
@@ -75,9 +79,11 @@ module.exports.tests.source_filter = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
-        body: { filter: { bool: { must: [
-          { term: { source_id: 'dataset/1' } }
-        ]}}}
+        body: { query: {
+          term: {
+            source_id: 'dataset/1'
+          }
+        }}
       }, function( err, res ){
         t.equal( res.hits.total, 2 );
         done();
@@ -89,7 +95,7 @@ module.exports.tests.source_filter = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
-        body: { filter: { bool: { must: [
+        body: { query: { bool: { must: [
           { term: { source: 'osm' } },
           { term: { source_id: 'dataset/1' } }
         ]}}}
@@ -104,9 +110,11 @@ module.exports.tests.source_filter = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
-        body: { filter: { bool: { must: [
-          { term: { source: 'OSM' } }
-        ]}}}
+        body: { query: {
+          term: {
+            source: 'OSM'
+          }
+        }}
       }, function( err, res ){
         t.equal( res.hits.total, 0 );
         done();
@@ -118,9 +126,11 @@ module.exports.tests.source_filter = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
-        body: { filter: { bool: { must: [
-          { term: { source: 'foo' } }
-        ]}}}
+        body: { query: {
+          term: {
+            source: 'foo'
+          }
+        }}
       }, function( err, res ){
         t.equal( res.hits.total, 0 );
         done();
@@ -132,9 +142,11 @@ module.exports.tests.source_filter = function(test, common){
       suite.client.search({
         index: suite.props.index,
         type: 'test',
-        body: { filter: { bool: { must: [
-          { term: { source: 'foo bar baz' } }
-        ]}}}
+        body: { query: {
+          term: {
+            source: 'foo bar baz'
+          }
+        }}
       }, function( err, res ){
         t.equal( res.hits.total, 1 );
         done();
diff --git a/integration/validate.js b/integration/validate.js
index ff666608..6ff19c0c 100644
--- a/integration/validate.js
+++ b/integration/validate.js
@@ -10,7 +10,7 @@ module.exports.tests = {};
 module.exports.tests.validate = function(test, common){
   test( 'schema', function(t){
 
-    var suite = new elastictest.Suite( null, { schema: schema } );
+    var suite = new elastictest.Suite( common.clientOpts, { schema: schema } );
 
     suite.assert( function( done ){
       suite.client.info({}, function( err, res, status ){
diff --git a/mappings/document.js b/mappings/document.js
index 382a4c25..779f3706 100644
--- a/mappings/document.js
+++ b/mappings/document.js
@@ -1,8 +1,9 @@
-var admin = require('./partial/admin');
-var postalcode = require('./partial/postalcode');
-var hash = require('./partial/hash');
-var multiplier = require('./partial/multiplier');
-var literal = require('./partial/literal');
+const admin = require('./partial/admin');
+const postalcode = require('./partial/postalcode');
+const hash = require('./partial/hash');
+const multiplier = require('./partial/multiplier');
+const literal = require('./partial/literal');
+const config = require('pelias-config').generate();
 
 var schema = {
   properties: {
@@ -26,22 +27,27 @@ var schema = {
         name: {
           type: 'string',
           analyzer: 'keyword',
+          norms: { enabled: false }
         },
         unit: {
           type: 'string',
           analyzer: 'peliasUnit',
+          norms: { enabled: false }
         },
         number: {
           type: 'string',
           analyzer: 'peliasHousenumber',
+          norms: { enabled: false }
         },
         street: {
           type: 'string',
           analyzer: 'peliasStreet',
+          norms: { enabled: false }
         },
         zip: {
           type: 'string',
           analyzer: 'peliasZip',
+          norms: { enabled: false }
         }
       }
     },
@@ -135,10 +141,8 @@ var schema = {
       match_mapping_type: 'string',
       mapping: {
         type: 'string',
-        analyzer: 'peliasIndexOneEdgeGram',
-        fielddata : {
-          loading: 'eager_global_ordinals'
-        }
+        norms: { enabled: false },
+        analyzer: 'peliasIndexOneEdgeGram'
       }
     },
   },{
@@ -147,10 +151,8 @@ var schema = {
       match_mapping_type: 'string',
       mapping: {
         type: 'string',
-        analyzer: 'peliasPhrase',
-        fielddata : {
-          loading: 'eager_global_ordinals'
-        }
+        norms: { enabled: false },
+        analyzer: 'peliasPhrase'
       }
     }
   }],
diff --git a/mappings/partial/admin.json b/mappings/partial/admin.json
index 13ee9240..ae8bda68 100644
--- a/mappings/partial/admin.json
+++ b/mappings/partial/admin.json
@@ -1,5 +1,6 @@
 {
   "type": "string",
   "analyzer": "peliasAdmin",
-  "store": "yes"
+  "store": "yes",
+  "norms": { "enabled": false }
 }
\ No newline at end of file
diff --git a/mappings/partial/boundingbox.json b/mappings/partial/boundingbox.json
index 088954c5..43925b27 100644
--- a/mappings/partial/boundingbox.json
+++ b/mappings/partial/boundingbox.json
@@ -1,5 +1,6 @@
 {
   "type": "string",
   "index": "no",
-  "store": "yes"
+  "store": "yes",
+  "norms": { "enabled": false }
 }
diff --git a/mappings/partial/centroid.js b/mappings/partial/centroid.js
deleted file mode 100644
index 317950d6..00000000
--- a/mappings/partial/centroid.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// @ref: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-geo-point-type.html
-var schema = {
-  'type': 'geo_point'
-};
-
-module.exports = schema;
diff --git a/mappings/partial/centroid.json b/mappings/partial/centroid.json
new file mode 100644
index 00000000..b2d6b739
--- /dev/null
+++ b/mappings/partial/centroid.json
@@ -0,0 +1,3 @@
+{
+  "type": "geo_point"
+}
\ No newline at end of file
diff --git a/mappings/partial/literal.json b/mappings/partial/literal.json
index 487833e2..c56d8739 100644
--- a/mappings/partial/literal.json
+++ b/mappings/partial/literal.json
@@ -1,5 +1,6 @@
 {
   "type": "string",
   "analyzer": "keyword",
-  "store": "yes"
+  "store": "yes",
+  "norms": { "enabled": false }
 }
diff --git a/mappings/partial/postalcode.json b/mappings/partial/postalcode.json
index f04099e6..daf0a989 100644
--- a/mappings/partial/postalcode.json
+++ b/mappings/partial/postalcode.json
@@ -1,5 +1,6 @@
 {
   "type": "string",
   "analyzer": "peliasZip",
-  "store": "yes"
+  "store": "yes",
+  "norms": { "enabled": false }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index e3f02e61..250506c9 100644
--- a/package.json
+++ b/package.json
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "colors": "^1.1.2",
-    "elasticsearch": "^15.0.0",
+    "elasticsearch": "^15.1.1",
     "joi": "^13.1.0",
     "lodash.merge": "^4.6.0",
-    "pelias-config": "^3.0.2"
+    "pelias-config": "^3.5.0"
   },
   "devDependencies": {
     "difflet": "^1.0.1",
-    "elastictest": "^1.2.0",
+    "elastictest": "^2.0.0",
     "proxyquire": "^2.0.0",
     "tap-spec": "^5.0.0",
     "tape": "^4.5.0"
diff --git a/scripts/setup_ci.sh b/scripts/setup_ci.sh
new file mode 100755
index 00000000..32d80fe8
--- /dev/null
+++ b/scripts/setup_ci.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+
+# download and install elastiosearch with ICU plugin
+# note: the download servers and plugin install binary changed between versions
+
+if [[ "${ES_VERSION}" == "2.4"* ]]; then
+
+  # download from legacy host
+  wget -O - https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz \
+    | tar xz --directory=/tmp/elasticsearch --strip-components=1
+
+  # install ICU plugin
+  /tmp/elasticsearch/bin/plugin install analysis-icu
+
+  # start elasticsearch server
+  /tmp/elasticsearch/bin/elasticsearch --daemonize --path.data /tmp
+else
+
+  # download from new host
+  wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz \
+    | tar xz --directory=/tmp/elasticsearch --strip-components=1
+
+  # install ICU plugin
+  /tmp/elasticsearch/bin/elasticsearch-plugin install analysis-icu
+
+  # start elasticsearch server
+  /tmp/elasticsearch/bin/elasticsearch --daemonize -Epath.data=/tmp -Edefault.path.data=/tmp -Ediscovery.type=single-node
+fi
+
+# set the correct esclient.apiVersion in pelias.json
+v=( ${ES_VERSION//./ } ) # split version number on '.'
+echo "{\"esclient\":{\"apiVersion\":\"${v[0]}.${v[1]}\"}}" > ~/pelias.json
+
+# debugging
+echo "--- pelias.json ---"
+cat ~/pelias.json
+
+echo "--- elasticsearch.yml ---"
+cat /tmp/elasticsearch/config/elasticsearch.yml
\ No newline at end of file
diff --git a/test/compile.js b/test/compile.js
index 1c64b87c..0d004ed9 100644
--- a/test/compile.js
+++ b/test/compile.js
@@ -42,9 +42,7 @@ module.exports.tests.dynamic_templates = function(test, common) {
     t.deepEqual(template.mapping, {
       type: 'string',
       analyzer: 'peliasIndexOneEdgeGram',
-      fielddata: {
-        loading: 'eager_global_ordinals'
-      }
+      norms: { enabled: false }
     });
     t.end();
   });
diff --git a/test/document.js b/test/document.js
index 4d5e729b..eab132f0 100644
--- a/test/document.js
+++ b/test/document.js
@@ -153,9 +153,7 @@ module.exports.tests.dynamic_templates = function(test, common) {
     t.deepEqual(template.mapping, {
       type: 'string',
       analyzer: 'peliasIndexOneEdgeGram',
-      fielddata: {
-        loading: 'eager_global_ordinals'
-      }
+      norms: { enabled: false }
     });
     t.end();
   });
@@ -167,9 +165,7 @@ module.exports.tests.dynamic_templates = function(test, common) {
     t.deepEqual(template.mapping, {
       type: 'string',
       analyzer: 'peliasPhrase',
-      fielddata: {
-        loading: 'eager_global_ordinals'
-      }
+      norms: { enabled: false }
     });
     t.end();
   });
diff --git a/test/fixtures/expected.json b/test/fixtures/expected.json
index cb6acfbd..522cf441 100644
--- a/test/fixtures/expected.json
+++ b/test/fixtures/expected.json
@@ -1442,17 +1442,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -1468,23 +1471,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -1495,197 +1503,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -1700,17 +1747,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -1729,9 +1779,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -1742,9 +1790,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -1765,17 +1811,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -1791,23 +1840,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -1818,197 +1872,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2023,17 +2116,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -2052,9 +2148,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2065,9 +2159,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -2088,17 +2180,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -2114,23 +2209,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2141,197 +2241,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2346,17 +2485,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -2375,9 +2517,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2388,9 +2528,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -2411,17 +2549,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -2437,23 +2578,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2464,197 +2610,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2669,17 +2854,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -2698,9 +2886,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2711,9 +2897,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -2734,17 +2918,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -2760,23 +2947,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2787,197 +2979,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -2992,17 +3223,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -3021,9 +3255,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3034,9 +3266,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -3057,17 +3287,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -3083,23 +3316,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3110,197 +3348,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3315,17 +3592,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -3344,9 +3624,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3357,9 +3635,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -3380,17 +3656,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -3406,23 +3685,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3433,197 +3717,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3638,17 +3961,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -3667,9 +3993,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3680,9 +4004,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -3703,17 +4025,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -3729,23 +4054,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3756,197 +4086,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -3961,17 +4330,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -3990,9 +4362,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4003,9 +4373,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -4026,17 +4394,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -4052,23 +4423,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4079,197 +4455,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4284,17 +4699,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -4313,9 +4731,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4326,9 +4742,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -4349,17 +4763,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -4375,23 +4792,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4402,197 +4824,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4607,17 +5068,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -4636,9 +5100,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4649,9 +5111,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -4672,17 +5132,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -4698,23 +5161,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4725,197 +5193,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4930,17 +5437,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -4959,9 +5469,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -4972,9 +5480,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -4995,17 +5501,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -5021,23 +5530,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5048,197 +5562,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5253,17 +5806,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -5282,9 +5838,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5295,9 +5849,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -5318,17 +5870,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -5344,23 +5899,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5371,197 +5931,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5576,17 +6175,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -5605,9 +6207,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5618,9 +6218,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -5641,17 +6239,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -5667,23 +6268,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5694,197 +6300,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5899,17 +6544,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -5928,9 +6576,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -5941,9 +6587,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }
@@ -5964,17 +6608,20 @@
         "source": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "layer": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "alpha3": {
           "type": "string",
           "analyzer": "peliasAdmin",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "name": {
           "type": "object",
@@ -5990,23 +6637,28 @@
           "properties": {
             "name": {
               "type": "string",
-              "analyzer": "keyword"
+              "analyzer": "keyword",
+              "norms": { "enabled": false }
             },
             "unit": {
               "type": "string",
-              "analyzer": "peliasUnit"
+              "analyzer": "peliasUnit",
+              "norms": { "enabled": false }
             },
             "number": {
               "type": "string",
-              "analyzer": "peliasHousenumber"
+              "analyzer": "peliasHousenumber",
+              "norms": { "enabled": false }
             },
             "street": {
               "type": "string",
-              "analyzer": "peliasStreet"
+              "analyzer": "peliasStreet",
+              "norms": { "enabled": false }
             },
             "zip": {
               "type": "string",
-              "analyzer": "peliasZip"
+              "analyzer": "peliasZip",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -6017,197 +6669,236 @@
             "continent": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "continent_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "empire_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "country_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "dependency_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macroregion_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "region_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "macrocounty_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "county_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "locality_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "borough_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "localadmin_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_a": {
               "type": "string",
               "analyzer": "peliasAdmin",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "neighbourhood_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_a": {
               "type": "string",
               "analyzer": "peliasZip",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             },
             "postalcode_id": {
               "type": "string",
               "analyzer": "keyword",
-              "store": "yes"
+              "store": "yes",
+              "norms": { "enabled": false }
             }
           }
         },
@@ -6222,17 +6913,20 @@
         "bounding_box": {
           "type": "string",
           "index": "no",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "source_id": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "category": {
           "type": "string",
           "analyzer": "keyword",
-          "store": "yes"
+          "store": "yes",
+          "norms": { "enabled": false }
         },
         "population": {
           "type": "long",
@@ -6251,9 +6945,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasIndexOneEdgeGram",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         },
@@ -6264,9 +6956,7 @@
             "mapping": {
               "type": "string",
               "analyzer": "peliasPhrase",
-              "fielddata": {
-                "loading": "eager_global_ordinals"
-              }
+              "norms": { "enabled": false }
             }
           }
         }