diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json
index 360ccea3e5..acc64472ad 100644
--- a/assets/layers/school/school.json
+++ b/assets/layers/school/school.json
@@ -145,6 +145,7 @@
     },
     {
       "id": "target-audience",
+      "condition": "school:for~*",
       "question": {
         "en":"What is the target audience for this school?"
       },
@@ -157,10 +158,17 @@
         "inline": true
       },
       "mappings": [
+        {
+          "if": "school:for=",
+          "then": {
+            "en": "This is a school where students study skills at their age-adequate level. <div>There are little or no special facilities to cater for students with special needs or facilities are ad-hoc</div>"
+          },
+          "hideInAnswer": true
+        },
         {
           "if": "school:for=mainstream",
           "then": {
-            "en": "This is a school where students study skills at their age-adequate level"
+            "en": "This is a school where students study skills at their age-adequate level."
           }
         },
         {
@@ -198,6 +206,12 @@
           "then": {
             "en": "This is a school with facilities for students with disabilities"
           }
+        },
+        {
+          "if": "school:for=special_needs",
+          "then": {
+            "en": "This is a school with facilities for students with special needs"
+          }
         }
       ]
     },