diff --git a/pelias.json.docker b/pelias.json.docker
index abf7cec1..d711d8c0 100644
--- a/pelias.json.docker
+++ b/pelias.json.docker
@@ -43,7 +43,7 @@
       }
     },
     "textAnalyzer": "libpostal",
-    "sizePadding": 7,
+    "sizePadding": 9,
     "minConfidence": 0.8,
     "relativeMinConfidence": 0.8,
     "languageMatchThreshold": 0.9,
diff --git a/query/fuzzy.js b/query/fuzzy.js
index 5b37d742..9f8297f9 100644
--- a/query/fuzzy.js
+++ b/query/fuzzy.js
@@ -28,7 +28,7 @@ query.score( peliasQuery.view.address('street') );
 query.score( peliasQuery.view.address('postcode') );
 
 // admin components
-query.score( peliasQuery.view.admin_multi_match(adminFields, 'peliasAdmin') );
+query.score( peliasQuery.view.admin_multi_match(adminFields, 'peliasIndexOneEdgeGram') );
 query.score( views.custom_boosts( config.customBoosts ) );
 
 // non-scoring hard filters
diff --git a/query/search_original.js b/query/search_original.js
index 1dc9d2a7..49a89e2a 100644
--- a/query/search_original.js
+++ b/query/search_original.js
@@ -56,6 +56,8 @@ function generateQuery( clean ){
 
   // input text
   vs.var( 'input:name', clean.text );
+  vs.var('phrase:multifield', ['phrase.*']);
+  vs.var('phrase:type', 'phrase');
 
   // sources
   if( _.isArray(clean.sources) && !_.isEmpty(clean.sources) ) {