diff --git a/config/search/config.json b/config/search/config.json
index 3a5d67e..a9dd6f4 100644
--- a/config/search/config.json
+++ b/config/search/config.json
@@ -92,22 +92,18 @@
         "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris"
       ],
       "properties": {
-        "given_name": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://xmlns.com/foaf/0.1/givenName"
-        ],
         "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "person_uuid": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://mu.semte.ch/vocabularies/core/uuid"
-        ],
         "family_name": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/familyName"
         ],
+        "given_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
         "first_name_used": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
@@ -166,6 +162,14 @@
       },
       "mappings": {
         "properties": {
+          "person_id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
           "family_name": {
             "type": "text",
             "fields": {
@@ -175,14 +179,6 @@
               }
             }
           },
-          "id": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword"
-              }
-            }
-          },
           "given_name": {
             "type": "text",
             "fields": {
@@ -192,10 +188,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -204,7 +197,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -231,6 +230,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -242,9 +250,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -254,22 +259,18 @@
       "on_path": "functionaries",
       "rdf_type": "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris",
       "properties": {
-        "given_name": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://xmlns.com/foaf/0.1/givenName"
-        ],
         "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "person_uuid": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://mu.semte.ch/vocabularies/core/uuid"
-        ],
         "family_name": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/familyName"
         ],
+        "given_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
         "first_name_used": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
@@ -328,6 +329,14 @@
       },
       "mappings": {
         "properties": {
+          "person_id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
           "family_name": {
             "type": "text",
             "fields": {
@@ -337,14 +346,6 @@
               }
             }
           },
-          "id": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword"
-              }
-            }
-          },
           "given_name": {
             "type": "text",
             "fields": {
@@ -354,10 +355,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -366,7 +364,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -393,6 +397,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -404,9 +417,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -419,22 +429,18 @@
         "http://data.lblod.info/vocabularies/contacthub/AgentInPositie"
       ],
       "properties": {
-        "given_name": [
-          "http://www.w3.org/ns/org#heldBy",
-          "http://xmlns.com/foaf/0.1/givenName"
-        ],
         "person_id": [
           "http://www.w3.org/ns/org#heldBy",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "person_uuid": [
-          "http://www.w3.org/ns/org#heldBy",
-          "http://mu.semte.ch/vocabularies/core/uuid"
-        ],
         "family_name": [
           "http://www.w3.org/ns/org#heldBy",
           "http://xmlns.com/foaf/0.1/familyName"
         ],
+        "given_name": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
         "first_name_used": [
           "http://www.w3.org/ns/org#heldBy",
           "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
@@ -483,6 +489,14 @@
       },
       "mappings": {
         "properties": {
+          "person_id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
           "family_name": {
             "type": "text",
             "fields": {
@@ -492,14 +506,6 @@
               }
             }
           },
-          "person_id": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword"
-              }
-            }
-          },
           "given_name": {
             "type": "text",
             "fields": {
@@ -509,10 +515,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -521,7 +524,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -548,6 +557,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -559,9 +577,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -571,14 +586,6 @@
       "composite_types": ["minister", "functionary", "mandatory"],
       "on_path": "people",
       "properties": [
-        {
-          "name": "given_name",
-          "mappings": {
-            "minister": "given_name",
-            "functionary": "given_name",
-            "mandatory": "given_name"
-          }
-        },
         {
           "name": "person_id",
           "mappings": {
@@ -595,6 +602,14 @@
             "mandatory": "family_name"
           }
         },
+        {
+          "name": "given_name",
+          "mappings": {
+            "minister": "given_name",
+            "functionary": "given_name",
+            "mandatory": "given_name"
+          }
+        },
         {
           "name": "first_name_used",
           "mappings": {
@@ -670,6 +685,14 @@
       ],
       "mappings": {
         "properties": {
+          "person_id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
           "family_name": {
             "type": "text",
             "fields": {
@@ -679,14 +702,6 @@
               }
             }
           },
-          "id": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword"
-              }
-            }
-          },
           "given_name": {
             "type": "text",
             "fields": {
@@ -696,10 +711,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -708,7 +720,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -735,6 +753,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -746,9 +773,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -810,12 +834,6 @@
       },
       "mappings": {
         "properties": {
-          "classification_id": {
-            "type": "text"
-          },
-          "recognized_worship_type_id": {
-            "type": "text"
-          },
           "name": {
             "type": "text",
             "fields": {
@@ -843,6 +861,9 @@
               }
             }
           },
+          "classification_id": {
+            "type": "text"
+          },
           "classification_name": {
             "type": "text",
             "fields": {
@@ -861,6 +882,12 @@
               }
             }
           },
+          "status_id": {
+            "type": "text"
+          },
+          "recognized_worship_type_id": {
+            "type": "text"
+          },
           "recognized_worship_type_name": {
             "type": "text",
             "fields": {
diff --git a/config/search/dev/config.json b/config/search/dev/config.json
index ab1902c..bfc90d7 100644
--- a/config/search/dev/config.json
+++ b/config/search/dev/config.json
@@ -6,7 +6,7 @@
     [
       {
         "variables": [],
-        "name": "acmidm-worship-editeerder"
+        "name": "acmidm-editeerder"
       },
       {
         "variables": [],
@@ -20,7 +20,7 @@
     [
       {
         "variables": [],
-        "name": "acmidm-editeerder"
+        "name": "acmidm-worship-editeerder"
       },
       {
         "variables": [],
@@ -64,22 +64,18 @@
         "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris"
       ],
       "properties": {
-        "given_name": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://xmlns.com/foaf/0.1/givenName"
-        ],
         "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "person_uuid": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://mu.semte.ch/vocabularies/core/uuid"
-        ],
         "family_name": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/familyName"
         ],
+        "given_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
         "first_name_used": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
@@ -138,6 +134,14 @@
       },
       "mappings": {
         "properties": {
+          "person_id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
           "family_name": {
             "type": "text",
             "fields": {
@@ -147,14 +151,6 @@
               }
             }
           },
-          "person_id": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword"
-              }
-            }
-          },
           "given_name": {
             "type": "text",
             "fields": {
@@ -164,10 +160,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -176,7 +169,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -203,6 +202,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -214,9 +222,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -226,22 +231,18 @@
       "on_path": "functionaries",
       "rdf_type": "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris",
       "properties": {
-        "given_name": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://xmlns.com/foaf/0.1/givenName"
-        ],
         "person_id": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "person_uuid": [
-          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
-          "http://mu.semte.ch/vocabularies/core/uuid"
-        ],
         "family_name": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "http://xmlns.com/foaf/0.1/familyName"
         ],
+        "given_name": [
+          "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
         "first_name_used": [
           "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan",
           "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
@@ -300,6 +301,14 @@
       },
       "mappings": {
         "properties": {
+          "person_id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
           "family_name": {
             "type": "text",
             "fields": {
@@ -309,14 +318,6 @@
               }
             }
           },
-          "person_id": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword"
-              }
-            }
-          },
           "given_name": {
             "type": "text",
             "fields": {
@@ -326,10 +327,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -338,7 +336,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -365,6 +369,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -376,9 +389,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -391,22 +401,18 @@
         "http://data.lblod.info/vocabularies/contacthub/AgentInPositie"
       ],
       "properties": {
-        "given_name": [
-          "http://www.w3.org/ns/org#heldBy",
-          "http://xmlns.com/foaf/0.1/givenName"
-        ],
         "person_id": [
           "http://www.w3.org/ns/org#heldBy",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
-        "person_uuid": [
-          "http://www.w3.org/ns/org#heldBy",
-          "http://mu.semte.ch/vocabularies/core/uuid"
-        ],
         "family_name": [
           "http://www.w3.org/ns/org#heldBy",
           "http://xmlns.com/foaf/0.1/familyName"
         ],
+        "given_name": [
+          "http://www.w3.org/ns/org#heldBy",
+          "http://xmlns.com/foaf/0.1/givenName"
+        ],
         "first_name_used": [
           "http://www.w3.org/ns/org#heldBy",
           "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam"
@@ -455,6 +461,14 @@
       },
       "mappings": {
         "properties": {
+          "person_id": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword"
+              }
+            }
+          },
           "family_name": {
             "type": "text",
             "fields": {
@@ -464,14 +478,6 @@
               }
             }
           },
-          "person_id": {
-            "type": "text",
-            "fields": {
-              "field": {
-                "type": "keyword"
-              }
-            }
-          },
           "given_name": {
             "type": "text",
             "fields": {
@@ -481,10 +487,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -493,7 +496,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -520,6 +529,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -531,9 +549,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -543,14 +558,6 @@
       "composite_types": ["minister", "functionary", "mandatory"],
       "on_path": "people",
       "properties": [
-        {
-          "name": "given_name",
-          "mappings": {
-            "minister": "given_name",
-            "functionary": "given_name",
-            "mandatory": "given_name"
-          }
-        },
         {
           "name": "person_id",
           "mappings": {
@@ -567,6 +574,14 @@
             "mandatory": "family_name"
           }
         },
+        {
+          "name": "given_name",
+          "mappings": {
+            "minister": "given_name",
+            "functionary": "given_name",
+            "mandatory": "given_name"
+          }
+        },
         {
           "name": "first_name_used",
           "mappings": {
@@ -642,16 +657,15 @@
       ],
       "mappings": {
         "properties": {
-          "family_name": {
+          "person_id": {
             "type": "text",
             "fields": {
               "field": {
-                "type": "keyword",
-                "normalizer": "custom_sort_normalizer"
+                "type": "keyword"
               }
             }
           },
-          "person_id": {
+          "family_name": {
             "type": "text",
             "fields": {
               "field": {
@@ -669,10 +683,7 @@
               }
             }
           },
-          "organization_id": {
-            "type": "text"
-          },
-          "organization_classification": {
+          "first_name_used": {
             "type": "text",
             "fields": {
               "field": {
@@ -681,7 +692,13 @@
               }
             }
           },
-          "organization_province": {
+          "end_date": {
+            "type": "date"
+          },
+          "organization_id": {
+            "type": "text"
+          },
+          "organization_classification": {
             "type": "text",
             "fields": {
               "field": {
@@ -708,6 +725,15 @@
               }
             }
           },
+          "organization_province": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "position_id": {
             "type": "text"
           },
@@ -719,9 +745,6 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
-          },
-          "end_date": {
-            "type": "date"
           }
         }
       }
@@ -783,12 +806,6 @@
       },
       "mappings": {
         "properties": {
-          "classification_id": {
-            "type": "text"
-          },
-          "recognized_worship_type_id": {
-            "type": "text"
-          },
           "name": {
             "type": "text",
             "fields": {
@@ -816,6 +833,9 @@
               }
             }
           },
+          "classification_id": {
+            "type": "text"
+          },
           "classification_name": {
             "type": "text",
             "fields": {
@@ -834,6 +854,12 @@
               }
             }
           },
+          "status_id": {
+            "type": "text"
+          },
+          "recognized_worship_type_id": {
+            "type": "text"
+          },
           "recognized_worship_type_name": {
             "type": "text",
             "fields": {