diff --git a/config/search/config.json b/config/search/config.json
index a9dd6f4..95a016e 100644
--- a/config/search/config.json
+++ b/config/search/config.json
@@ -131,24 +131,6 @@
           "http://data.vlaanderen.be/ns/besluit#bestuurt",
           "http://www.w3.org/2004/02/skos/core#prefLabel"
         ],
-        "organization_municipality": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://www.w3.org/ns/org#hasPost",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
-        ],
-        "organization_province": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://www.w3.org/ns/org#hasPost",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "http://www.w3.org/ns/locn#adminUnitL2"
-        ],
         "position_id": [
           "http://www.w3.org/ns/org#holds",
           "http://www.w3.org/ns/org#role",
@@ -221,24 +203,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },
@@ -298,24 +262,6 @@
           "http://data.vlaanderen.be/ns/besluit#bestuurt",
           "http://www.w3.org/2004/02/skos/core#prefLabel"
         ],
-        "organization_municipality": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
-        ],
-        "organization_province": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "http://www.w3.org/ns/locn#adminUnitL2"
-        ],
         "position_id": [
           "http://www.w3.org/ns/org#holds",
           "http://www.w3.org/ns/org#role",
@@ -388,24 +334,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },
@@ -462,20 +390,6 @@
           "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
           "http://www.w3.org/2004/02/skos/core#prefLabel"
         ],
-        "organization_municipality": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
-        ],
-        "organization_province": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "http://www.w3.org/ns/locn#adminUnitL2"
-        ],
         "position_id": [
           "http://www.w3.org/ns/org#holds",
           "http://data.lblod.info/vocabularies/erediensten/functie",
@@ -548,24 +462,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },
@@ -650,22 +546,6 @@
             "mandatory": "organization_name"
           }
         },
-        {
-          "name": "organization_municipality",
-          "mappings": {
-            "minister": "organization_municipality",
-            "functionary": "organization_municipality",
-            "mandatory": "organization_municipality"
-          }
-        },
-        {
-          "name": "organization_province",
-          "mappings": {
-            "minister": "organization_province",
-            "functionary": "organization_province",
-            "mandatory": "organization_province"
-          }
-        },
         {
           "name": "position_id",
           "mappings": {
@@ -744,24 +624,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },
diff --git a/config/search/dev/config.json b/config/search/dev/config.json
index bfc90d7..e178c04 100644
--- a/config/search/dev/config.json
+++ b/config/search/dev/config.json
@@ -103,24 +103,6 @@
           "http://data.vlaanderen.be/ns/besluit#bestuurt",
           "http://www.w3.org/2004/02/skos/core#prefLabel"
         ],
-        "organization_municipality": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://www.w3.org/ns/org#hasPost",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
-        ],
-        "organization_province": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://www.w3.org/ns/org#hasPost",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "http://www.w3.org/ns/locn#adminUnitL2"
-        ],
         "position_id": [
           "http://www.w3.org/ns/org#holds",
           "http://www.w3.org/ns/org#role",
@@ -193,24 +175,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },
@@ -270,24 +234,6 @@
           "http://data.vlaanderen.be/ns/besluit#bestuurt",
           "http://www.w3.org/2004/02/skos/core#prefLabel"
         ],
-        "organization_municipality": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
-        ],
-        "organization_province": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie",
-          "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
-          "http://data.vlaanderen.be/ns/besluit#bestuurt",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "http://www.w3.org/ns/locn#adminUnitL2"
-        ],
         "position_id": [
           "http://www.w3.org/ns/org#holds",
           "http://www.w3.org/ns/org#role",
@@ -360,24 +306,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },
@@ -434,20 +362,6 @@
           "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
           "http://www.w3.org/2004/02/skos/core#prefLabel"
         ],
-        "organization_municipality": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "https://data.vlaanderen.be/ns/adres#gemeentenaam"
-        ],
-        "organization_province": [
-          "http://www.w3.org/ns/org#holds",
-          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
-          "http://www.w3.org/ns/org#hasPrimarySite",
-          "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-          "http://www.w3.org/ns/locn#adminUnitL2"
-        ],
         "position_id": [
           "http://www.w3.org/ns/org#holds",
           "http://data.lblod.info/vocabularies/erediensten/functie",
@@ -520,24 +434,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },
@@ -622,22 +518,6 @@
             "mandatory": "organization_name"
           }
         },
-        {
-          "name": "organization_municipality",
-          "mappings": {
-            "minister": "organization_municipality",
-            "functionary": "organization_municipality",
-            "mandatory": "organization_municipality"
-          }
-        },
-        {
-          "name": "organization_province",
-          "mappings": {
-            "minister": "organization_province",
-            "functionary": "organization_province",
-            "mandatory": "organization_province"
-          }
-        },
         {
           "name": "position_id",
           "mappings": {
@@ -716,24 +596,6 @@
               }
             }
           },
-          "organization_municipality": {
-            "type": "keyword",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
-          "organization_province": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
-              }
-            }
-          },
           "position_id": {
             "type": "text"
           },