diff --git a/query/autocomplete.js b/query/autocomplete.js
index 8429083c..363c74bf 100644
--- a/query/autocomplete.js
+++ b/query/autocomplete.js
@@ -25,7 +25,7 @@ var ngrams_last_only = function( vs ){
   vs2.var('input:name').set( name.substr( name.lastIndexOf(' ')+1 ) );
 
   var view = ngrams( vs2 );
-  view.match['name.default'].analyzer = 'standard';
+  view.match['name.default'].analyzer = 'peliasPhrase';
 
   return view;
 };
diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js
index acf341b1..f14e1441 100644
--- a/query/autocomplete_defaults.js
+++ b/query/autocomplete_defaults.js
@@ -20,7 +20,7 @@ module.exports = extend( false, peliasQuery.defaults, {
   'boundary:rect:type': 'indexed',
   'boundary:rect:_cache': true,
 
-  'ngram:analyzer': 'standard',
+  'ngram:analyzer': 'peliasPhrase',
   'ngram:field': 'name.default',
   'ngram:boost': 100,
 
@@ -33,7 +33,7 @@ module.exports = extend( false, peliasQuery.defaults, {
   'focus:offset': '10km',
   'focus:scale': '250km',
   'focus:decay': 0.5,
-  'focus:weight': 5,
+  'focus:weight': 3,
 
   'function_score:score_mode': 'avg',
   'function_score:boost_mode': 'multiply',