diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json
index 06ea3eb578..b10738200d 100644
--- a/assets/layers/school/school.json
+++ b/assets/layers/school/school.json
@@ -159,6 +159,7 @@
       "id": "school-name"
     },
     "contact",
+    "address.address",
     {
       "id": "capacity",
       "question": {
@@ -322,13 +323,14 @@
           {
             "or": [
               "school:special_needs=no",
-              "school:special_needs="
+              "school:special_needs=",
+              "school:special_needs=limited"
             ]
-          },
-          "special_needs:.*!~~yes"
+          }
         ]
       },
       "multiAnswer": true,
+      "filter": true,
       "mappings": [
         {
           "if": "school:orientation=academic",
@@ -555,6 +557,7 @@
         },
         {
           "if": "school:special_needs=limited",
+          "alsoShowIf": "school:special_needs=",
           "then": {
             "en": "This school offers limited, ad hoc support but has no significant expertise and is not considered a special needs school.",
             "nl": "Deze school biedt ad hoc, beperkte extra zorg aan maar telt niet als buitengwoon onderwij.s"
@@ -566,6 +569,14 @@
             "en": "This school has no support for special need students.",
             "nl": "Deze school heeft geen ondersteuning voor buitengewone leerlingen."
           }
+        },
+        {
+          "if": "school:special_needs=yes",
+          "hideInAnswer": true,
+          "then": {
+            "en": "This school is for special need students.",
+            "nl": "Deze school is voor buitengewone leerlingen."
+          }
         }
       ]
     },
@@ -794,6 +805,11 @@
     {
       "id": "has_special_needs",
       "options": [
+        {
+          "question": {
+            "en": "Does this school have special need education?"
+          }
+        },
         {
           "question": {
             "en": "Has special education",
@@ -805,6 +821,18 @@
               "school:special_needs!=no"
             ]
           }
+        },
+        {
+          "question": {
+            "en": "No or limited special need education"
+          },
+          "osmTags": {
+            "or": [
+              "school:special_needs=",
+              "school:special_needs=no",
+              "school:special_needs=limited"
+            ]
+          }
         }
       ]
     }