diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js
index 7bb430cc..ba52a049 100644
--- a/query/autocomplete_defaults.js
+++ b/query/autocomplete_defaults.js
@@ -39,15 +39,15 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'function_score:boost_mode': 'multiply',
 
   'address:housenumber:analyzer': 'peliasHousenumber',
-  'address:housenumber:field': 'address.number',
+  'address:housenumber:field': 'address_parts.number',
   'address:housenumber:boost': 2,
 
   'address:street:analyzer': 'peliasStreet',
-  'address:street:field': 'address.street',
+  'address:street:field': 'address_parts.street',
   'address:street:boost': 5,
 
   'address:postcode:analyzer': 'peliasZip',
-  'address:postcode:field': 'address.zip',
+  'address:postcode:field': 'address_parts.zip',
   'address:postcode:boost': 2000,
 
   'admin:country_a:analyzer': 'standard',
diff --git a/query/reverse_defaults.js b/query/reverse_defaults.js
index c32b1c3d..306efaac 100644
--- a/query/reverse_defaults.js
+++ b/query/reverse_defaults.js
@@ -39,15 +39,15 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'function_score:boost_mode': 'replace',
 
   'address:housenumber:analyzer': 'peliasHousenumber',
-  'address:housenumber:field': 'address.number',
+  'address:housenumber:field': 'address_parts.number',
   'address:housenumber:boost': 2,
 
   'address:street:analyzer': 'peliasStreet',
-  'address:street:field': 'address.street',
+  'address:street:field': 'address_parts.street',
   'address:street:boost': 5,
 
   'address:postcode:analyzer': 'peliasZip',
-  'address:postcode:field': 'address.zip',
+  'address:postcode:field': 'address_parts.zip',
   'address:postcode:boost': 3,
 
   'admin:country_a:analyzer': 'standard',
diff --git a/query/search_defaults.js b/query/search_defaults.js
index e9a918cd..ea0dc87f 100644
--- a/query/search_defaults.js
+++ b/query/search_defaults.js
@@ -39,15 +39,15 @@ module.exports = _.merge({}, peliasQuery.defaults, {
   'function_score:boost_mode': 'replace',
 
   'address:housenumber:analyzer': 'peliasHousenumber',
-  'address:housenumber:field': 'address.number',
+  'address:housenumber:field': 'address_parts.number',
   'address:housenumber:boost': 2,
 
   'address:street:analyzer': 'peliasStreet',
-  'address:street:field': 'address.street',
+  'address:street:field': 'address_parts.street',
   'address:street:boost': 5,
 
   'address:postcode:analyzer': 'peliasZip',
-  'address:postcode:field': 'address.zip',
+  'address:postcode:field': 'address_parts.zip',
   'address:postcode:boost': 20,
 
   'admin:country_a:analyzer': 'standard',