diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json
index 6b2599e69..7180057a0 100644
--- a/assets/layers/school/school.json
+++ b/assets/layers/school/school.json
@@ -249,14 +249,48 @@
         "nl": "Wat is de voertaal van deze school?<div class='subtle'>Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?</div>"
       },
       "render": {
-        "en": "{school:language} is the main language of {title()}",
-        "nl": "{school:language} is de voertaal van {title()}"
+        "en": "{school:language} is the main language of {name}",
+        "nl": "{school:language} is de voertaal van {name}"
       },
       "freeform": {
         "key": "school:language",
-        "inline": true
+        "inline": true,
+        "placeholder": {
+          "en":"Language in lowercase English",
+          "nl":"Taal in lowercase Engel"},
+        "addExtraTags": [
+          "fixme=Freeform tag `school:language` used, to be doublechecked"
+        ]
       },
       "mappings": [
+        {
+          "if": "school:language=english",
+          "then": {
+            "en": "English is the main language of {name}",
+            "nl": "Engels is de voertaal van {name}"
+          }
+        },
+        {
+          "if": "school:language=french",
+          "then": {
+            "en": "French is the main language of {name}",
+            "nl": "Frans is de voertaal van {name}"
+          }
+        },
+        {
+          "if": "school:language=dutch",
+          "then": {
+            "en": "Dutch is the main language of {name}",
+            "nl": "Nederlands is de voertaal van {name}"
+          }
+        },
+        {
+          "if": "school:language=german",
+          "then": {
+            "en": "German is the main language of {name}",
+            "nl": "Duits is de voertaal van {name}"
+          }
+        },
         {
           "if": "school:language=",
           "then": {
@@ -307,4 +341,4 @@
       "width": 1
     }
   ]
-}
\ No newline at end of file
+}