diff --git a/config/search/config.json b/config/search/config.json
index 781c514..5bd2211 100644
--- a/config/search/config.json
+++ b/config/search/config.json
@@ -174,6 +174,14 @@
           "http://data.vlaanderen.be/ns/besluit#bestuurt",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
+        "organization_classification": [
+          "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#classification",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
         "organization_name": [
           "http://www.w3.org/ns/org#holds",
           "^http://www.w3.org/ns/org#hasPost",
@@ -241,6 +249,15 @@
           "organization_id": {
             "type": "text"
           },
+          "organization_classification": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "organization_province": {
             "type": "text",
             "fields": {
@@ -320,6 +337,12 @@
           "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
+        "organization_classification": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/ns/org#classification",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
         "organization_name": [
           "http://www.w3.org/ns/org#holds",
           "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
@@ -381,6 +404,15 @@
           "organization_id": {
             "type": "text"
           },
+          "organization_classification": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "organization_province": {
             "type": "text",
             "fields": {
@@ -476,6 +508,13 @@
             "mandatory": "organization_id"
           }
         },
+        {
+          "name": "organization_classification",
+          "mappings": {
+            "minister": "organization_classification",
+            "mandatory": "organization_classification"
+          }
+        },
         {
           "name": "organization_name",
           "mappings": {
@@ -543,6 +582,15 @@
           "organization_id": {
             "type": "text"
           },
+          "organization_classification": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "organization_province": {
             "type": "text",
             "fields": {
diff --git a/config/search/dev/config.json b/config/search/dev/config.json
index 11dc627..1fe644a 100644
--- a/config/search/dev/config.json
+++ b/config/search/dev/config.json
@@ -98,6 +98,14 @@
           "http://data.vlaanderen.be/ns/besluit#bestuurt",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
+        "organization_classification": [
+          "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#classification",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
         "organization_name": [
           "http://www.w3.org/ns/org#holds",
           "^http://www.w3.org/ns/org#hasPost",
@@ -165,6 +173,15 @@
           "organization_id": {
             "type": "text"
           },
+          "organization_classification": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "organization_province": {
             "type": "text",
             "fields": {
@@ -245,6 +262,12 @@
           "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
           "http://mu.semte.ch/vocabularies/core/uuid"
         ],
+        "organization_classification": [
+          "http://www.w3.org/ns/org#holds",
+          "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+          "http://www.w3.org/ns/org#classification",
+          "http://www.w3.org/2004/02/skos/core#prefLabel"
+        ],
         "organization_name": [
           "http://www.w3.org/ns/org#holds",
           "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
@@ -306,6 +329,15 @@
           "organization_id": {
             "type": "text"
           },
+          "organization_classification": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "organization_province": {
             "type": "text",
             "fields": {
@@ -401,6 +433,13 @@
             "mandatory": "organization_id"
           }
         },
+        {
+          "name": "organization_classification",
+          "mappings": {
+            "minister": "organization_classification",
+            "mandatory": "organization_classification"
+          }
+        },
         {
           "name": "organization_name",
           "mappings": {
@@ -469,6 +508,15 @@
           "organization_id": {
             "type": "text"
           },
+          "organization_classification": {
+            "type": "text",
+            "fields": {
+              "field": {
+                "type": "keyword",
+                "normalizer": "custom_sort_normalizer"
+              }
+            }
+          },
           "organization_province": {
             "type": "text",
             "fields": {