diff --git a/package.json b/package.json
index 2f30eeb79..e389e8c42 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "pelias-logger": "^1.2.0",
     "pelias-microservice-wrapper": "^1.7.0",
     "pelias-model": "^5.8.0",
-    "pelias-query": "^9.10.0",
+    "pelias-query": "^9.13.0",
     "pelias-sorting": "^1.2.0",
     "predicates": "^2.0.0",
     "retry": "^0.12.0",
diff --git a/test/unit/fixture/search_boundary_country.js b/test/unit/fixture/search_boundary_country.js
index 31cad683e..9688fe9a2 100644
--- a/test/unit/fixture/search_boundary_country.js
+++ b/test/unit/fixture/search_boundary_country.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_boundary_country_multi.js b/test/unit/fixture/search_boundary_country_multi.js
index 426db1ee3..491e52f17 100644
--- a/test/unit/fixture/search_boundary_country_multi.js
+++ b/test/unit/fixture/search_boundary_country_multi.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_boundary_gid.js b/test/unit/fixture/search_boundary_gid.js
index 131029b27..56916ee95 100644
--- a/test/unit/fixture/search_boundary_gid.js
+++ b/test/unit/fixture/search_boundary_gid.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_fallback.js b/test/unit/fixture/search_fallback.js
index 3725dff1d..84c71c25a 100644
--- a/test/unit/fixture/search_fallback.js
+++ b/test/unit/fixture/search_fallback.js
@@ -101,12 +101,16 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.number': 'number value'
+                      'address_parts.number': {
+                        'query': 'number value'
+                      }
                     }
                   },
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   },
                   {
@@ -181,7 +185,9 @@ module.exports = {
                 'should': [
                   {
                     'match_phrase': {
-                      'address_parts.zip': 'postalcode value'
+                      'address_parts.zip': {
+                        'query': 'postalcode value'
+                      }
                     }
                   }
                 ],
@@ -268,7 +274,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   },
                   {
@@ -343,7 +351,9 @@ module.exports = {
                 'should': [
                   {
                     'match_phrase': {
-                      'address_parts.zip': 'postalcode value'
+                      'address_parts.zip': {
+                        'query': 'postalcode value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js
index 1692b8b9f..abaa5d666 100644
--- a/test/unit/fixture/search_linguistic_bbox.js
+++ b/test/unit/fixture/search_linguistic_bbox.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js
index 095844323..73ac3fa72 100644
--- a/test/unit/fixture/search_linguistic_focus.js
+++ b/test/unit/fixture/search_linguistic_focus.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js
index 9a4a6a88b..bb5e80fb1 100644
--- a/test/unit/fixture/search_linguistic_focus_bbox.js
+++ b/test/unit/fixture/search_linguistic_focus_bbox.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js
index e137a1682..405442486 100644
--- a/test/unit/fixture/search_linguistic_focus_null_island.js
+++ b/test/unit/fixture/search_linguistic_focus_null_island.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_linguistic_only.js b/test/unit/fixture/search_linguistic_only.js
index e30751ead..fefcc6f3b 100644
--- a/test/unit/fixture/search_linguistic_only.js
+++ b/test/unit/fixture/search_linguistic_only.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_with_category_filtering.js b/test/unit/fixture/search_with_category_filtering.js
index 739355871..34d4b348a 100644
--- a/test/unit/fixture/search_with_category_filtering.js
+++ b/test/unit/fixture/search_with_category_filtering.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],
diff --git a/test/unit/fixture/search_with_source_filtering.js b/test/unit/fixture/search_with_source_filtering.js
index 6797aecf5..b39075f28 100644
--- a/test/unit/fixture/search_with_source_filtering.js
+++ b/test/unit/fixture/search_with_source_filtering.js
@@ -12,7 +12,9 @@ module.exports = {
                 'must': [
                   {
                     'match_phrase': {
-                      'address_parts.street': 'street value'
+                      'address_parts.street': {
+                        'query': 'street value'
+                      }
                     }
                   }
                 ],