diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 90048681e..60452cb5b 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -331,10 +331,6 @@
                 "if": "theme=uk_addresses",
                 "then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
               },
-              {
-                "if": "theme=walls_and_buildings",
-                "then": "./assets/layers/walls_and_buildings/walls_and_buildings.png"
-              },
               {
                 "if": "theme=waste",
                 "then": "./assets/layers/recycling/recycling-14.svg"
diff --git a/index.manifest b/index.manifest
index 5679708fc..1e577af78 100644
--- a/index.manifest
+++ b/index.manifest
@@ -1,5 +1,5 @@
 {
-  "name": "MapComplete",
+  "name": "index",
   "short_name": "MapComplete",
   "start_url": "index.html",
   "lang": "en",
diff --git a/langs/en.json b/langs/en.json
index e893fb262..aa7323d5c 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -235,6 +235,8 @@
         "skip": "Skip this question",
         "skippedQuestions": "Some questions are skipped",
         "testing": "Testing - changes won't be saved",
+        "useSearch": "Use the search above to see presets",
+        "useSearchForMore": "Use the search function to search within {total} more values....",
         "weekdays": {
             "abbreviations": {
                 "friday": "Fri",
diff --git a/langs/layers/de.json b/langs/layers/de.json
index fb8f4b7a4..b563fa055 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -5122,6 +5122,11 @@
             }
         },
         "tagRenderings": {
+            "8": {
+                "override": {
+                    "question": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>"
+                }
+            },
             "capacity": {
                 "question": "Wie viele Schüler können sich maximal an dieser Schule anmelden?",
                 "render": "Diese Schule kann höchstens {capacity} Schüler aufnehmen"
@@ -5169,30 +5174,6 @@
                 },
                 "question": "Welche Geschlechter können sich an dieser Schule anmelden?"
             },
-            "language": {
-                "freeform": {
-                    "placeholder": "Sprache in Englisch in Kleinbuchstaben"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "Die Hauptsprache dieser Schule ist unbekannt"
-                    },
-                    "1": {
-                        "then": "Französisch ist die Hauptsprache von {name}"
-                    },
-                    "2": {
-                        "then": "Niederländisch ist die Hauptsprache von {name}"
-                    },
-                    "3": {
-                        "then": "Deutsch ist die Hauptsprache von {name}"
-                    },
-                    "4": {
-                        "then": "Die Hauptsprache dieser Schule ist unbekannt"
-                    }
-                },
-                "question": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>",
-                "render": "{school:language} ist die Hauptsprache von {title()}"
-            },
             "school-name": {
                 "question": "Wie lautet der Name dieser Schule?",
                 "render": "Diese Schule heißt {name}"
@@ -6139,11 +6120,6 @@
     },
     "walls_and_buildings": {
         "description": "Spezielle eingebaute Ebene, die alle Wände und Gebäude bereitstellt. Diese Ebene ist in Voreinstellungen für Objekte nützlich, die an Wänden platziert werden können (z. B. AEDs, Briefkästen, Eingänge, Adressen, Überwachungskameras, …). Diese Ebene ist standardmäßig unsichtbar und kann vom Benutzer nicht eingeschaltet werden.",
-        "tagRenderings": {
-            "Entrance_width": {
-                "render": "Diese Tür hat eine Durchgangsbreite von {canonical(_entrance:width)} Meter"
-            }
-        },
         "title": {
             "render": "Wand oder Gebäude"
         }
diff --git a/langs/layers/en.json b/langs/layers/en.json
index b405e8850..600f5b5a2 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -5303,6 +5303,16 @@
             }
         },
         "tagRenderings": {
+            "8": {
+                "override": {
+                    "+mappings": {
+                        "0": {
+                            "then": "The main language of this school is unknown"
+                        }
+                    },
+                    "question": "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>"
+                }
+            },
             "capacity": {
                 "question": "How much students can at most enroll in this school?",
                 "render": "This school can enroll at most {capacity} students"
@@ -5350,30 +5360,6 @@
                 },
                 "question": "Which genders can enroll at this school?"
             },
-            "language": {
-                "freeform": {
-                    "placeholder": "Language in lowercase English"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "The main language of this school is unknown"
-                    },
-                    "1": {
-                        "then": "French is the main language of {name}"
-                    },
-                    "2": {
-                        "then": "Dutch is the main language of {name}"
-                    },
-                    "3": {
-                        "then": "German is the main language of {name}"
-                    },
-                    "4": {
-                        "then": "The main language of this school is unknown"
-                    }
-                },
-                "question": "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": "{school:language} is the main language of {title()}"
-            },
             "school-name": {
                 "question": "What is the name of this school?",
                 "render": "This school is named {name}"
@@ -6542,16 +6528,6 @@
     },
     "walls_and_buildings": {
         "description": "Special builtin layer providing all walls and buildings. This layer is useful in presets for objects which can be placed against walls (e.g. AEDs, postboxes, entrances, addresses, surveillance cameras, …). This layer is invisible by default and not toggleable by the user.",
-        "tagRenderings": {
-            "Entrance_width": {
-                "mappings": {
-                    "0": {
-                        "then": "This entrance has no width information"
-                    }
-                },
-                "render": "This door has a width of {canonical(_entrance:width)} meter"
-            }
-        },
         "title": {
             "render": "Wall or building"
         }
diff --git a/langs/layers/es.json b/langs/layers/es.json
index a1b3078a7..8ea7f34c7 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -3985,11 +3985,6 @@
         }
     },
     "walls_and_buildings": {
-        "tagRenderings": {
-            "Entrance_width": {
-                "render": "Esta puerta tiene una ancho de {canonical(_entrance:width)} metros"
-            }
-        },
         "title": {
             "render": "Pared o edificio"
         }
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 388f83931..3ff5eb6e6 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -2419,6 +2419,11 @@
             }
         },
         "tagRenderings": {
+            "8": {
+                "override": {
+                    "question": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>"
+                }
+            },
             "capacity": {
                 "question": "Combien d'élèves peuvent s'inscrire au maximum dans cette école ?",
                 "render": "Cette école peut accueillir au maximum {capacity} étudiants"
@@ -2466,18 +2471,6 @@
                 },
                 "question": "Quels genres de personnes peuvent s'inscrire dans cette école ?"
             },
-            "language": {
-                "mappings": {
-                    "0": {
-                        "then": "La langue principale de cette école est inconnue"
-                    },
-                    "4": {
-                        "then": "La langue principale de cette école est inconnue"
-                    }
-                },
-                "question": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>",
-                "render": "{school:language} est la langue principale de {title()}"
-            },
             "school-name": {
                 "question": "Quel est le nom de cet établissement scolaire?",
                 "render": "Cet établissement scolaire s'appelle {name}"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 579ab1a4d..8b303458f 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -5112,6 +5112,16 @@
             }
         },
         "tagRenderings": {
+            "8": {
+                "override": {
+                    "+mappings": {
+                        "0": {
+                            "then": "De voertaal van deze school is niet gekend"
+                        }
+                    },
+                    "question": "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>"
+                }
+            },
             "capacity": {
                 "question": "Ten hoogste hoeveel studenten kunnen er les volgen in deze school?",
                 "render": "Deze school kan maximaal {capacity} studenten lesgeven"
@@ -5159,30 +5169,6 @@
                 },
                 "question": "Mogen jongens en meisjes les volgen op deze school?"
             },
-            "language": {
-                "freeform": {
-                    "placeholder": "Taal in lowercase Engel"
-                },
-                "mappings": {
-                    "0": {
-                        "then": "De voertaal van deze school is niet gekend"
-                    },
-                    "1": {
-                        "then": "Frans is de voertaal van {name}"
-                    },
-                    "2": {
-                        "then": "Nederlands is de voertaal van {name}"
-                    },
-                    "3": {
-                        "then": "Duits is de voertaal van {name}"
-                    },
-                    "4": {
-                        "then": "De voertaal van deze school is niet gekend"
-                    }
-                },
-                "question": "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": "{school:language} is de voertaal van {title()}"
-            },
             "school-name": {
                 "question": "Wat is de naam van deze school?",
                 "render": "Deze school heet <b>{name}</b>"
@@ -6228,11 +6214,6 @@
     },
     "walls_and_buildings": {
         "description": "Speciale laag met alle muren en gebouwen. Deze laag is nuttig om objecten toe te voegen die met een muur verbonden zijn (zoals AEDs, brievenbussen, adressen, bewakingscamera's,…). Deze laag is standaard onzichtbaar en kan niet aangezet worden door de gebruiker.",
-        "tagRenderings": {
-            "Entrance_width": {
-                "render": "Deze deur heeft een breedte van {canonical(_entrance:width)} meter"
-            }
-        },
         "title": {
             "render": "Muur of gebouw"
         }
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 49201c12f..5dd1e80ae 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -974,10 +974,6 @@
         "shortDescription": "Map all the trees",
         "title": "Trees"
     },
-    "walls_and_buildings": {
-        "description": "Special builtin layer providing all walls and buildings. This layer is useful in presets for objects which can be placed against walls (e.g. AEDs, postboxes, entrances, addresses, surveillance cameras, …). This layer is invisible by default and not toggleable by the user.",
-        "title": "Walls and buildings"
-    },
     "waste": {
         "description": "Map showing waste baskets and recycling facilities.",
         "title": "Waste"