diff --git a/package.json b/package.json
index d60c0b42..2a5cbe2e 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "pelias-logger": "0.2.0",
     "pelias-microservice-wrapper": "1.1.2",
     "pelias-model": "4.9.0",
-    "pelias-query": "8.15.0",
+    "pelias-query": "8.16.1",
     "pelias-sorting": "1.0.1",
     "pelias-text-analyzer": "1.8.3",
     "predicates": "^1.0.1",
diff --git a/test/unit/fixture/search_boundary_country.js b/test/unit/fixture/search_boundary_country.js
index ee6427a0..31cad683 100644
--- a/test/unit/fixture/search_boundary_country.js
+++ b/test/unit/fixture/search_boundary_country.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_fallback.js b/test/unit/fixture/search_fallback.js
index 3835cadb..3725dff1 100644
--- a/test/unit/fixture/search_fallback.js
+++ b/test/unit/fixture/search_fallback.js
@@ -2,837 +2,829 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.venue',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'query value',
-                          'type': 'phrase',
-                          'fields': [
-                            'phrase.default'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'neighbourhood value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.neighbourhood',
-                            'parent.neighbourhood_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'borough value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.borough',
-                            'parent.borough_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.locality',
-                            'parent.locality_a',
-                            'parent.localadmin',
-                            'parent.localadmin_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'venue'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.venue',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'query value',
+                      'type': 'phrase',
+                      'fields': [
+                        'phrase.default'
+                      ]
                     }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'neighbourhood value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.neighbourhood',
+                        'parent.neighbourhood_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'borough value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.borough',
+                        'parent.borough_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.locality',
+                        'parent.locality_a',
+                        'parent.localadmin',
+                        'parent.localadmin_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'venue'
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.address',
-                    'boost': 10,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.number': 'number value'
-                        }
-                      },
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'neighbourhood value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.neighbourhood',
-                            'parent.neighbourhood_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'borough value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.borough',
-                            'parent.borough_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.locality',
-                            'parent.locality_a',
-                            'parent.localadmin',
-                            'parent.localadmin_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'should': [
-                      {
-                        'match_phrase': {
-                          'address_parts.zip': 'postalcode value'
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'address'
-                      }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.address',
+                'boost': 10,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.number': 'number value'
+                    }
+                  },
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'neighbourhood value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.neighbourhood',
+                        'parent.neighbourhood_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'borough value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.borough',
+                        'parent.borough_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.locality',
+                        'parent.locality_a',
+                        'parent.localadmin',
+                        'parent.localadmin_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
                     }
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.postalcode',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'postalcode value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.postalcode'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.locality',
-                            'parent.locality_a',
-                            'parent.localadmin',
-                            'parent.localadmin_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'postalcode'
-                      }
+                ],
+                'should': [
+                  {
+                    'match_phrase': {
+                      'address_parts.zip': 'postalcode value'
                     }
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'neighbourhood value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.neighbourhood',
-                            'parent.neighbourhood_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'borough value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.borough',
-                            'parent.borough_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.locality',
-                            'parent.locality_a',
-                            'parent.localadmin',
-                            'parent.localadmin_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'should': [
-                      {
-                        'match_phrase': {
-                          'address_parts.zip': 'postalcode value'
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'address'
+                  }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.postalcode',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'postalcode value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.postalcode'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.locality',
+                        'parent.locality_a',
+                        'parent.localadmin',
+                        'parent.localadmin_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
                     }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'postalcode'
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.neighbourhood',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'neighbourhood value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.neighbourhood',
-                            'parent.neighbourhood_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'borough value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.borough',
-                            'parent.borough_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.locality',
-                            'parent.locality_a',
-                            'parent.localadmin',
-                            'parent.localadmin_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'neighbourhood'
-                      }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'neighbourhood value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.neighbourhood',
+                        'parent.neighbourhood_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'borough value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.borough',
+                        'parent.borough_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.locality',
+                        'parent.locality_a',
+                        'parent.localadmin',
+                        'parent.localadmin_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
                     }
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.borough',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'borough value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.borough',
-                            'parent.borough_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.locality',
-                            'parent.locality_a',
-                            'parent.localadmin',
-                            'parent.localadmin_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'borough'
-                      }
+                ],
+                'should': [
+                  {
+                    'match_phrase': {
+                      'address_parts.zip': 'postalcode value'
                     }
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.locality',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.locality',
-                            'parent.locality_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'locality'
-                      }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.neighbourhood',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'neighbourhood value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.neighbourhood',
+                        'parent.neighbourhood_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'borough value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.borough',
+                        'parent.borough_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.locality',
+                        'parent.locality_a',
+                        'parent.localadmin',
+                        'parent.localadmin_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
                     }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'neighbourhood'
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.localadmin',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'city value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.localadmin',
-                            'parent.localadmin_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a',
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'localadmin'
-                      }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.borough',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'borough value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.borough',
+                        'parent.borough_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.locality',
+                        'parent.locality_a',
+                        'parent.localadmin',
+                        'parent.localadmin_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'borough'
+                  }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.locality',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.locality',
+                        'parent.locality_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
                     }
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.county',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.county',
-                            'parent.county_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'county'
-                      }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'locality'
+                  }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.localadmin',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'city value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.localadmin',
+                        'parent.localadmin_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a',
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'localadmin'
+                  }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.county',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.county',
+                        'parent.county_a'
+                      ]
                     }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'county'
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.macrocounty',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'county value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.macrocounty',
-                            'parent.macrocounty_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a',
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'macrocounty'
-                      }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.macrocounty',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'county value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.macrocounty',
+                        'parent.macrocounty_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a',
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
                     }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'macrocounty'
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.region',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.region',
-                            'parent.region_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'region'
-                      }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.region',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.region',
+                        'parent.region_a'
+                      ]
                     }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
+                    }
+                  }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'region'
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.macroregion',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'state value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.macroregion',
-                            'parent.macroregion_a'
-                          ]
-                        }
-                      },
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a',
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'macroregion'
-                      }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.macroregion',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'state value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.macroregion',
+                        'parent.macroregion_a'
+                      ]
+                    }
+                  },
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a',
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
                     }
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.dependency',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.dependency',
-                            'parent.dependency_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'dependency'
-                      }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'macroregion'
+                  }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.dependency',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.dependency',
+                        'parent.dependency_a'
+                      ]
                     }
                   }
-                },
-                {
-                  'bool': {
-                    '_name': 'fallback.country',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'country value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.country',
-                            'parent.country_a'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'country'
-                      }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'dependency'
+                  }
+                }
+              }
+            },
+            {
+              'bool': {
+                '_name': 'fallback.country',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'country value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.country',
+                        'parent.country_a'
+                      ]
                     }
                   }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'country'
+                  }
                 }
-              ]
-            }
-          },
-          'filter': {
-            'bool': {
-              'must': []
+              }
             }
-          }
+          ]
         }
       },
       'max_boost': 20,
diff --git a/test/unit/fixture/search_fallback_postalcode_only.js b/test/unit/fixture/search_fallback_postalcode_only.js
index 4519e166..76b2dbbf 100644
--- a/test/unit/fixture/search_fallback_postalcode_only.js
+++ b/test/unit/fixture/search_fallback_postalcode_only.js
@@ -2,39 +2,31 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.postalcode',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': '90210',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.postalcode'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'postalcode'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.postalcode',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': '90210',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.postalcode'
+                      ]
                     }
                   }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'postalcode'
+                  }
                 }
-              ]
-            }
-          },
-          'filter': {
-            'bool': {
-              'must': []
+              }
             }
-          }
+          ]
         }
       },
       'max_boost': 20,
diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js
index e74f6c79..1692b8b9 100644
--- a/test/unit/fixture/search_linguistic_bbox.js
+++ b/test/unit/fixture/search_linguistic_bbox.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_linguistic_focus.js b/test/unit/fixture/search_linguistic_focus.js
index a63400b3..ac48702e 100644
--- a/test/unit/fixture/search_linguistic_focus.js
+++ b/test/unit/fixture/search_linguistic_focus.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js
index 7f6c8528..0aed4961 100644
--- a/test/unit/fixture/search_linguistic_focus_bbox.js
+++ b/test/unit/fixture/search_linguistic_focus_bbox.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_linguistic_focus_null_island.js b/test/unit/fixture/search_linguistic_focus_null_island.js
index da12154a..6ba7aa7d 100644
--- a/test/unit/fixture/search_linguistic_focus_null_island.js
+++ b/test/unit/fixture/search_linguistic_focus_null_island.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_linguistic_only.js b/test/unit/fixture/search_linguistic_only.js
index 0117e03b..e30751ea 100644
--- a/test/unit/fixture/search_linguistic_only.js
+++ b/test/unit/fixture/search_linguistic_only.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_linguistic_viewport.js b/test/unit/fixture/search_linguistic_viewport.js
index 0117e03b..e30751ea 100644
--- a/test/unit/fixture/search_linguistic_viewport.js
+++ b/test/unit/fixture/search_linguistic_viewport.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_linguistic_viewport_min_diagonal.js b/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
index 0117e03b..e30751ea 100644
--- a/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
+++ b/test/unit/fixture/search_linguistic_viewport_min_diagonal.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_with_category_filtering.js b/test/unit/fixture/search_with_category_filtering.js
index 05f9ec4e..73935587 100644
--- a/test/unit/fixture/search_with_category_filtering.js
+++ b/test/unit/fixture/search_with_category_filtering.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/search_with_source_filtering.js b/test/unit/fixture/search_with_source_filtering.js
index 0e9010c2..6797aecf 100644
--- a/test/unit/fixture/search_with_source_filtering.js
+++ b/test/unit/fixture/search_with_source_filtering.js
@@ -2,32 +2,29 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.street',
-                    'boost': 5,
-                    'must': [
-                      {
-                        'match_phrase': {
-                          'address_parts.street': 'street value'
-                        }
-                      }
-                    ],
-                    'should': [],
-                    'filter': {
-                      'term': {
-                        'layer': 'street'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.street',
+                'boost': 5,
+                'must': [
+                  {
+                    'match_phrase': {
+                      'address_parts.street': 'street value'
                     }
                   }
+                ],
+                'should': [],
+                'filter': {
+                  'term': {
+                    'layer': 'street'
+                  }
                 }
-              ]
+              }
             }
-          },
+          ],
           'filter': {
             'bool': {
               'must': [
diff --git a/test/unit/fixture/structured_geocoding/boundary_country.json b/test/unit/fixture/structured_geocoding/boundary_country.json
index 182da5a9..edff5d63 100644
--- a/test/unit/fixture/structured_geocoding/boundary_country.json
+++ b/test/unit/fixture/structured_geocoding/boundary_country.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
@@ -59,4 +56,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
\ No newline at end of file
+}
diff --git a/test/unit/fixture/structured_geocoding/fallback.json b/test/unit/fixture/structured_geocoding/fallback.json
index 58d0ce8c..7b737ffd 100644
--- a/test/unit/fixture/structured_geocoding/fallback.json
+++ b/test/unit/fixture/structured_geocoding/fallback.json
@@ -2,838 +2,830 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": [
-                {
-                  "bool": {
-                    "_name": "fallback.venue",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "query value",
-                          "type": "phrase",
-                          "fields": [
-                            "phrase.default",
-                            "category"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "neighbourhood value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.neighbourhood",
-                            "parent.neighbourhood_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "borough value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.borough",
-                            "parent.borough_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.locality",
-                            "parent.locality_a",
-                            "parent.localadmin",
-                            "parent.localadmin_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "venue"
-                      }
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [
+            {
+              "bool": {
+                "_name": "fallback.venue",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "query value",
+                      "type": "phrase",
+                      "fields": [
+                        "phrase.default",
+                        "category"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "neighbourhood value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.neighbourhood",
+                        "parent.neighbourhood_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "borough value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.borough",
+                        "parent.borough_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.locality",
+                        "parent.locality_a",
+                        "parent.localadmin",
+                        "parent.localadmin_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.address",
-                    "must": [
-                      {
-                        "match_phrase": {
-                          "address_parts.number": "number value"
-                        }
-                      },
-                      {
-                        "match_phrase": {
-                          "address_parts.street": "street value"
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "neighbourhood value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.neighbourhood",
-                            "parent.neighbourhood_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "borough value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.borough",
-                            "parent.borough_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.locality",
-                            "parent.locality_a",
-                            "parent.localadmin",
-                            "parent.localadmin_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "should": [
-                      {
-                        "match_phrase": {
-                          "address_parts.zip": "postalcode value"
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "address"
-                      }
-                    },
-                    "boost": 10
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "venue"
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.street",
-                    "must": [
-                      {
-                        "match_phrase": {
-                          "address_parts.street": "street value"
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "neighbourhood value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.neighbourhood",
-                            "parent.neighbourhood_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "borough value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.borough",
-                            "parent.borough_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.locality",
-                            "parent.locality_a",
-                            "parent.localadmin",
-                            "parent.localadmin_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "should": [
-                      {
-                        "match_phrase": {
-                          "address_parts.zip": "postalcode value"
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "street"
-                      }
-                    },
-                    "boost": 5
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.address",
+                "must": [
+                  {
+                    "match_phrase": {
+                      "address_parts.number": "number value"
+                    }
+                  },
+                  {
+                    "match_phrase": {
+                      "address_parts.street": "street value"
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "neighbourhood value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.neighbourhood",
+                        "parent.neighbourhood_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "borough value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.borough",
+                        "parent.borough_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.locality",
+                        "parent.locality_a",
+                        "parent.localadmin",
+                        "parent.localadmin_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
+                    }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.postalcode",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "postalcode value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.postalcode"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.locality",
-                            "parent.locality_a",
-                            "parent.localadmin",
-                            "parent.localadmin_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "postalcode"
-                      }
+                ],
+                "should": [
+                  {
+                    "match_phrase": {
+                      "address_parts.zip": "postalcode value"
                     }
                   }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "address"
+                  }
                 },
-                {
-                  "bool": {
-                    "_name": "fallback.neighbourhood",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "neighbourhood value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.neighbourhood",
-                            "parent.neighbourhood_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "borough value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.borough",
-                            "parent.borough_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.locality",
-                            "parent.locality_a",
-                            "parent.localadmin",
-                            "parent.localadmin_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "neighbourhood"
-                      }
+                "boost": 10
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.street",
+                "must": [
+                  {
+                    "match_phrase": {
+                      "address_parts.street": "street value"
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "neighbourhood value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.neighbourhood",
+                        "parent.neighbourhood_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "borough value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.borough",
+                        "parent.borough_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.locality",
+                        "parent.locality_a",
+                        "parent.localadmin",
+                        "parent.localadmin_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.borough",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "borough value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.borough",
-                            "parent.borough_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.locality",
-                            "parent.locality_a",
-                            "parent.localadmin",
-                            "parent.localadmin_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "borough"
-                      }
+                ],
+                "should": [
+                  {
+                    "match_phrase": {
+                      "address_parts.zip": "postalcode value"
                     }
                   }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "street"
+                  }
                 },
-                {
-                  "bool": {
-                    "_name": "fallback.locality",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.locality",
-                            "parent.locality_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "locality"
-                      }
+                "boost": 5
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.postalcode",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "postalcode value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.postalcode"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.locality",
+                        "parent.locality_a",
+                        "parent.localadmin",
+                        "parent.localadmin_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.localadmin",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "city value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.localadmin",
-                            "parent.localadmin_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a",
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "localadmin"
-                      }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "postalcode"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.neighbourhood",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "neighbourhood value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.neighbourhood",
+                        "parent.neighbourhood_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "borough value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.borough",
+                        "parent.borough_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.locality",
+                        "parent.locality_a",
+                        "parent.localadmin",
+                        "parent.localadmin_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.county",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.county",
-                            "parent.county_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "county"
-                      }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "neighbourhood"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.borough",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "borough value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.borough",
+                        "parent.borough_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.locality",
+                        "parent.locality_a",
+                        "parent.localadmin",
+                        "parent.localadmin_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.macrocounty",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "county value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.macrocounty",
-                            "parent.macrocounty_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a",
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "macrocounty"
-                      }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "borough"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.locality",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.locality",
+                        "parent.locality_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.region",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.region",
-                            "parent.region_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "region"
-                      }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "locality"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.localadmin",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "city value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.localadmin",
+                        "parent.localadmin_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a",
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.macroregion",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "state value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.macroregion",
-                            "parent.macroregion_a"
-                          ]
-                        }
-                      },
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a",
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "macroregion"
-                      }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "localadmin"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.county",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.county",
+                        "parent.county_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.dependency",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.dependency",
-                            "parent.dependency_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "dependency"
-                      }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "county"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.macrocounty",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "county value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.macrocounty",
+                        "parent.macrocounty_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a",
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
-                },
-                {
-                  "bool": {
-                    "_name": "fallback.country",
-                    "must": [
-                      {
-                        "multi_match": {
-                          "query": "country value",
-                          "type": "phrase",
-                          "fields": [
-                            "parent.country",
-                            "parent.country_a"
-                          ]
-                        }
-                      }
-                    ],
-                    "filter": {
-                      "term": {
-                        "layer": "country"
-                      }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "macrocounty"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.region",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.region",
+                        "parent.region_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
                     }
                   }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "region"
+                  }
                 }
-              ]
-            }
-          },
-          "filter": {
-            "bool": {
-              "must": []
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.macroregion",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "state value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.macroregion",
+                        "parent.macroregion_a"
+                      ]
+                    }
+                  },
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a",
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
+                    }
+                  }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "macroregion"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.dependency",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.dependency",
+                        "parent.dependency_a"
+                      ]
+                    }
+                  }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "dependency"
+                  }
+                }
+              }
+            },
+            {
+              "bool": {
+                "_name": "fallback.country",
+                "must": [
+                  {
+                    "multi_match": {
+                      "query": "country value",
+                      "type": "phrase",
+                      "fields": [
+                        "parent.country",
+                        "parent.country_a"
+                      ]
+                    }
+                  }
+                ],
+                "filter": {
+                  "term": {
+                    "layer": "country"
+                  }
+                }
+              }
             }
-          }
+          ]
         }
       },
       "max_boost": 20,
diff --git a/test/unit/fixture/structured_geocoding/linguistic_bbox.json b/test/unit/fixture/structured_geocoding/linguistic_bbox.json
index 2912a10d..94acc81d 100644
--- a/test/unit/fixture/structured_geocoding/linguistic_bbox.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_bbox.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
@@ -62,4 +59,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
\ No newline at end of file
+}
diff --git a/test/unit/fixture/structured_geocoding/linguistic_focus.json b/test/unit/fixture/structured_geocoding/linguistic_focus.json
index cee04e8e..0bb126d1 100644
--- a/test/unit/fixture/structured_geocoding/linguistic_focus.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_focus.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
@@ -65,4 +62,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
\ No newline at end of file
+}
diff --git a/test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json b/test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json
index 8c9e8cef..5b98f11f 100644
--- a/test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
diff --git a/test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json b/test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json
index 59fd11bb..d8723845 100644
--- a/test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
@@ -65,4 +62,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
\ No newline at end of file
+}
diff --git a/test/unit/fixture/structured_geocoding/linguistic_only.json b/test/unit/fixture/structured_geocoding/linguistic_only.json
index 17a54486..4de54360 100644
--- a/test/unit/fixture/structured_geocoding/linguistic_only.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_only.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
@@ -51,4 +48,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
\ No newline at end of file
+}
diff --git a/test/unit/fixture/structured_geocoding/linguistic_viewport.json b/test/unit/fixture/structured_geocoding/linguistic_viewport.json
index 17a54486..4de54360 100644
--- a/test/unit/fixture/structured_geocoding/linguistic_viewport.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_viewport.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
@@ -51,4 +48,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
\ No newline at end of file
+}
diff --git a/test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json b/test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json
index 17a54486..4de54360 100644
--- a/test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json
+++ b/test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json
@@ -2,12 +2,9 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [],
           "filter": {
             "bool": {
               "must": [
@@ -51,4 +48,4 @@
   ],
   "size": 10,
   "track_scores": true
-}
\ No newline at end of file
+}
diff --git a/test/unit/fixture/structured_geocoding/postalcode_only.js b/test/unit/fixture/structured_geocoding/postalcode_only.js
index 7dafbaa0..2eb10d30 100644
--- a/test/unit/fixture/structured_geocoding/postalcode_only.js
+++ b/test/unit/fixture/structured_geocoding/postalcode_only.js
@@ -2,39 +2,31 @@ module.exports = {
   'query': {
     'function_score': {
       'query': {
-        'filtered': {
-          'query': {
-            'bool': {
-              'should': [
-                {
-                  'bool': {
-                    '_name': 'fallback.postalcode',
-                    'must': [
-                      {
-                        'multi_match': {
-                          'query': 'postalcode value',
-                          'type': 'phrase',
-                          'fields': [
-                            'parent.postalcode'
-                          ]
-                        }
-                      }
-                    ],
-                    'filter': {
-                      'term': {
-                        'layer': 'postalcode'
-                      }
+        'bool': {
+          'minimum_should_match': 1,
+          'should': [
+            {
+              'bool': {
+                '_name': 'fallback.postalcode',
+                'must': [
+                  {
+                    'multi_match': {
+                      'query': 'postalcode value',
+                      'type': 'phrase',
+                      'fields': [
+                        'parent.postalcode'
+                      ]
                     }
                   }
+                ],
+                'filter': {
+                  'term': {
+                    'layer': 'postalcode'
+                  }
                 }
-              ]
-            }
-          },
-          'filter': {
-            'bool': {
-              'must': []
+              }
             }
-          }
+          ]
         }
       },
       'max_boost': 20,
diff --git a/test/unit/fixture/structured_geocoding/with_source_filtering.json b/test/unit/fixture/structured_geocoding/with_source_filtering.json
index 659d5eb4..77e4fb87 100644
--- a/test/unit/fixture/structured_geocoding/with_source_filtering.json
+++ b/test/unit/fixture/structured_geocoding/with_source_filtering.json
@@ -2,12 +2,10 @@
   "query": {
     "function_score": {
       "query": {
-        "filtered": {
-          "query": {
-            "bool": {
-              "should": []
-            }
-          },
+        "bool": {
+          "minimum_should_match": 1,
+          "should": [
+          ],
           "filter": {
             "bool": {
               "must": [
@@ -51,4 +49,4 @@
   ],
   "size": 20,
   "track_scores": true
-}
\ No newline at end of file
+}