diff --git a/layout/AddressesUsingIdsQuery.js b/layout/AddressesUsingIdsQuery.js
index 2856d31..afc43e1 100644
--- a/layout/AddressesUsingIdsQuery.js
+++ b/layout/AddressesUsingIdsQuery.js
@@ -169,7 +169,7 @@ class AddressesUsingIdsQuery extends Query {
         function_score: {
           query: {
             bool: {
-              minimum_number_should_match: 1,
+              minimum_should_match: 1,
               should: [
                 createStreetShould(vs)
               ]
@@ -216,10 +216,10 @@ class AddressesUsingIdsQuery extends Query {
         return acc;
       }, []);
 
-      // add filter.bool.minimum_number_should_match and filter.bool.should,
+      // add filter.bool.minimum_should_match and filter.bool.should,
       //  creating intermediate objects as it goes
       _.set(base.query.function_score.query.bool, 'filter.bool', {
-        minimum_number_should_match: 1,
+        minimum_should_match: 1,
         should: id_filters
       });
 
diff --git a/test/fixtures/addressesUsingIdsQuery/housenumber_no_units.json b/test/fixtures/addressesUsingIdsQuery/housenumber_no_units.json
index 812127d..aa959a7 100644
--- a/test/fixtures/addressesUsingIdsQuery/housenumber_no_units.json
+++ b/test/fixtures/addressesUsingIdsQuery/housenumber_no_units.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
diff --git a/test/fixtures/addressesUsingIdsQuery/no_housenumber.json b/test/fixtures/addressesUsingIdsQuery/no_housenumber.json
index ec097c2..a5928f4 100644
--- a/test/fixtures/addressesUsingIdsQuery/no_housenumber.json
+++ b/test/fixtures/addressesUsingIdsQuery/no_housenumber.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
diff --git a/test/fixtures/addressesUsingIdsQuery/no_layers.json b/test/fixtures/addressesUsingIdsQuery/no_layers.json
index 247c80d..22acc61 100644
--- a/test/fixtures/addressesUsingIdsQuery/no_layers.json
+++ b/test/fixtures/addressesUsingIdsQuery/no_layers.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
diff --git a/test/fixtures/addressesUsingIdsQuery/no_layers_with_boosts.json b/test/fixtures/addressesUsingIdsQuery/no_layers_with_boosts.json
index 43af2e2..3b67b77 100644
--- a/test/fixtures/addressesUsingIdsQuery/no_layers_with_boosts.json
+++ b/test/fixtures/addressesUsingIdsQuery/no_layers_with_boosts.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
diff --git a/test/fixtures/addressesUsingIdsQuery/unit_no_housenumber.json b/test/fixtures/addressesUsingIdsQuery/unit_no_housenumber.json
index 50dfdc3..7ef55af 100644
--- a/test/fixtures/addressesUsingIdsQuery/unit_no_housenumber.json
+++ b/test/fixtures/addressesUsingIdsQuery/unit_no_housenumber.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
diff --git a/test/fixtures/addressesUsingIdsQuery/with_filters.json b/test/fixtures/addressesUsingIdsQuery/with_filters.json
index 7386c45..8746f4c 100644
--- a/test/fixtures/addressesUsingIdsQuery/with_filters.json
+++ b/test/fixtures/addressesUsingIdsQuery/with_filters.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
diff --git a/test/fixtures/addressesUsingIdsQuery/with_layers.json b/test/fixtures/addressesUsingIdsQuery/with_layers.json
index cbd052c..57fafb6 100644
--- a/test/fixtures/addressesUsingIdsQuery/with_layers.json
+++ b/test/fixtures/addressesUsingIdsQuery/with_layers.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
@@ -60,7 +60,7 @@
           ],
           "filter": {
             "bool": {
-              "minimum_number_should_match": 1,
+              "minimum_should_match": 1,
               "should": [
                 {
                   "terms": {
diff --git a/test/fixtures/addressesUsingIdsQuery/with_layers_and_filters.json b/test/fixtures/addressesUsingIdsQuery/with_layers_and_filters.json
index 39be28f..22695a3 100644
--- a/test/fixtures/addressesUsingIdsQuery/with_layers_and_filters.json
+++ b/test/fixtures/addressesUsingIdsQuery/with_layers_and_filters.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {
@@ -60,7 +60,7 @@
           ],
           "filter": {
             "bool": {
-              "minimum_number_should_match": 1,
+              "minimum_should_match": 1,
               "should": [
                 {
                   "terms": {
diff --git a/test/fixtures/addressesUsingIdsQuery/with_scores.json b/test/fixtures/addressesUsingIdsQuery/with_scores.json
index 755ba15..8b2caca 100644
--- a/test/fixtures/addressesUsingIdsQuery/with_scores.json
+++ b/test/fixtures/addressesUsingIdsQuery/with_scores.json
@@ -3,7 +3,7 @@
     "function_score": {
       "query": {
         "bool": {
-          "minimum_number_should_match": 1,
+          "minimum_should_match": 1,
           "should": [
             {
               "bool": {