diff --git a/assets/layers/kindergarten_childcare/kindergarten_childcare.json b/assets/layers/kindergarten_childcare/kindergarten_childcare.json
index 6764abf95..789608a18 100644
--- a/assets/layers/kindergarten_childcare/kindergarten_childcare.json
+++ b/assets/layers/kindergarten_childcare/kindergarten_childcare.json
@@ -9,7 +9,8 @@
     "osmTags": {
       "or": [
         "amenity=childcare",
-        "amenity=kindergarten"
+        "amenity=kindergarten",
+        "isced:level:2011=early_childhood"
       ]
     }
   },
diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json
index 918a9dbf0..878cd4388 100644
--- a/assets/layers/school/school.json
+++ b/assets/layers/school/school.json
@@ -56,6 +56,12 @@
       "id": "education-level",
       "question": "What level of education is given on this school?",
       "mappings": [
+        {
+          "if": "isced:2011:level=early_childhood",
+          "then": {
+            "en": "This is a school with a kindergarten section where young kids receive some education which prepares reading and writing."
+          }
+        },
         {
           "if": "isced:2011:level=primary",
           "then": {
@@ -188,7 +194,28 @@
     },
     "website",
     "phone",
-    "email"
+    "email",
+    {
+      "id": "language",
+      "question": {
+        "en": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>"
+      },
+      "render": {
+        "en":"{school:language} is the main language of {title()}"
+      },
+      "freeform": {
+        "key": "school:language",
+        "type": "language",
+        "inline": true
+      },
+      "mappings": [{
+        "if": "school:language=",
+        "then": {
+          "en": "The main language of this school is unknown"
+        },
+        "hideInAnswer": true
+      }]
+    }
   ],
   "presets": [
     {
diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json
index 0ed43b6b2..e8c7993b0 100644
--- a/assets/layers/tertiary_education/tertiary_education.json
+++ b/assets/layers/tertiary_education/tertiary_education.json
@@ -52,9 +52,12 @@
     ]
   },
   "tagRenderings": [
-    "school.capacity",
-    "school.gender",
-    "school.target-audience",
+    {
+      "builtin": ["school.capacity","school.gender"],
+      "override": {
+        "condition": null
+      }
+    },
     "website",
     "email",
     "phone"
diff --git a/assets/themes/education/education.json b/assets/themes/education/education.json
index 1874a2c32..35e7acbd7 100644
--- a/assets/themes/education/education.json
+++ b/assets/themes/education/education.json
@@ -13,9 +13,10 @@
   "startLon": 0,
   "startZoom": 0,
   "icon": "./assets/layers/school/college.svg",
+  "#layers:note": "kindergarten_childcare must be _below_ school, as it can 'catch' primary schools which do have an integrated preschool",
   "layers": [
-    "kindergarten_childcare",
     "school",
-    "tertiary_education"
+    "tertiary_education",
+    "kindergarten_childcare"
   ]
 }
\ No newline at end of file