diff --git a/langs/layers/de.json b/langs/layers/de.json
index 68bbb842a..b78ae0210 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -3273,22 +3273,25 @@
             "render": "Defibrillator"
         }
     },
+    "dentist": {
+        "presets": {
+            "0": {
+                "title": "eine Zahnarztpraxis"
+            }
+        },
+        "title": {
+            "render": "Arztpraxis {name}"
+        }
+    },
     "direction": {
         "description": "Diese Ebene visualisiert Richtungen",
         "name": "Aufnahmewinkel der Kamera anzeigen"
     },
     "doctors": {
-        "description": "Diese Ebene zeigt Arztpraxen, Zahnärzte und andere Gesundheitseinrichtungen",
         "name": "Ärzte",
         "presets": {
             "0": {
                 "title": "eine Arztpraxis"
-            },
-            "1": {
-                "title": "eine Zahnarztpraxis"
-            },
-            "2": {
-                "title": "Praxis eines Physiotherapeuten"
             }
         },
         "tagRenderings": {
@@ -5575,6 +5578,13 @@
             "render": "{name}"
         }
     },
+    "physiotherapist": {
+        "presets": {
+            "0": {
+                "title": "Praxis eines Physiotherapeuten"
+            }
+        }
+    },
     "picnic_table": {
         "description": "Die Ebene zeigt Picknicktische an",
         "name": "Picknick-Tische",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index e440f47bd..bcc2de837 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3273,22 +3273,34 @@
             "render": "Defibrillator"
         }
     },
+    "dentist": {
+        "description": "This layer shows dentist offices",
+        "name": "Dentist",
+        "presets": {
+            "0": {
+                "title": "a dentists office"
+            }
+        },
+        "tagRenderings": {
+            "name": {
+                "question": "What is the name of this dentist?",
+                "render": "This dentist is called {name}"
+            }
+        },
+        "title": {
+            "render": "Dentist Office {name}"
+        }
+    },
     "direction": {
         "description": "This layer visualizes directions",
         "name": "Direction visualization"
     },
     "doctors": {
-        "description": "This layer shows doctor offices, dentists and other healthcare facilities",
+        "description": "This layer shows doctor offices",
         "name": "Doctors",
         "presets": {
             "0": {
                 "title": "a doctors office"
-            },
-            "1": {
-                "title": "a dentists office"
-            },
-            "2": {
-                "title": "a physiotherapists office"
             }
         },
         "tagRenderings": {
@@ -5610,6 +5622,24 @@
             "render": "{name}"
         }
     },
+    "physiotherapist": {
+        "description": "This layer shows physiotherapists",
+        "name": "Physiotherapist",
+        "presets": {
+            "0": {
+                "title": "a physiotherapists office"
+            }
+        },
+        "tagRenderings": {
+            "name": {
+                "question": "What is the name of this physiotherapists office?",
+                "render": "This physiotherapists office is called {name}"
+            }
+        },
+        "title": {
+            "render": "Physiotherapist {name}"
+        }
+    },
     "picnic_table": {
         "description": "The layer showing picnic tables",
         "name": "Picnic tables",
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 0b466e83f..ab7978bfc 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -2123,22 +2123,25 @@
             "render": "Défibrillateur"
         }
     },
+    "dentist": {
+        "presets": {
+            "0": {
+                "title": "un cabinet de dentistes"
+            }
+        },
+        "title": {
+            "render": "Cabinet medical {name}"
+        }
+    },
     "direction": {
         "description": "Cette couche visualise les directions",
         "name": "Visualisation de la direction"
     },
     "doctors": {
-        "description": "Ce calque montre les cabinets médicaux, les dentistes et autres établissements de santé",
         "name": "Médecins",
         "presets": {
             "0": {
                 "title": "un cabinet médical"
-            },
-            "1": {
-                "title": "un cabinet de dentistes"
-            },
-            "2": {
-                "title": "un cabinet de kinésithérapeutes"
             }
         },
         "tagRenderings": {
@@ -3196,6 +3199,13 @@
         "description": "Sentiers piétonniers, particulièrement utilisés pour la navigation intérieure et les entrées d'accrochage à cette couche",
         "name": "Sentiers piétons"
     },
+    "physiotherapist": {
+        "presets": {
+            "0": {
+                "title": "un cabinet de kinésithérapeutes"
+            }
+        }
+    },
     "picnic_table": {
         "description": "La couche montrant les tables de pique-nique",
         "name": "Tables de pique-nique",
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 4dc0be931..bb2a0b001 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3220,22 +3220,26 @@
             "render": "Defibrillator"
         }
     },
+    "dentist": {
+        "name": "Tandarts",
+        "presets": {
+            "0": {
+                "title": "een tandartspraktijk"
+            }
+        },
+        "title": {
+            "render": "Dokterspraktijk {name}"
+        }
+    },
     "direction": {
         "description": "Deze laag toont de oriëntatie van een object",
         "name": "Richtingsvisualisatie"
     },
     "doctors": {
-        "description": "Deze laag toont dokterspraktijken, tandartsen en andere gezondheidszorgfaciliteiten",
         "name": "Dokters",
         "presets": {
             "0": {
                 "title": "een dokterspraktijk"
-            },
-            "1": {
-                "title": "een tandartspraktijk"
-            },
-            "2": {
-                "title": "een fysiotherapeutenpraktijk"
             }
         },
         "tagRenderings": {
@@ -5359,6 +5363,24 @@
             "render": "{name}"
         }
     },
+    "physiotherapist": {
+        "description": "Deze laag toont kinesisten",
+        "name": "Kinesist",
+        "presets": {
+            "0": {
+                "title": "een fysiotherapeutenpraktijk"
+            }
+        },
+        "tagRenderings": {
+            "name": {
+                "question": "Wat is de naam van deze kinesistenpraktijk?",
+                "render": "Deze kinesistenpraktijk heet {name}"
+            }
+        },
+        "title": {
+            "render": "Kinesist {name}"
+        }
+    },
     "picnic_table": {
         "description": "Deze laag toont picknicktafels",
         "name": "Picknicktafels",
diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json
index bfe6f8573..fe824523b 100644
--- a/langs/shared-questions/en.json
+++ b/langs/shared-questions/en.json
@@ -115,6 +115,18 @@
                 }
             }
         },
+        "opening_hours_by_appointment": {
+            "override": {
+                "mappings": {
+                    "0": {
+                        "then": "Only by appointment"
+                    },
+                    "1": {
+                        "then": "Only by appointment"
+                    }
+                }
+            }
+        },
         "payment-options": {
             "mappings": {
                 "0": {
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index d447ba3a4..2f2e77b89 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -3,10 +3,6 @@
         "description": "Op deze kaart kan je informatie over AEDs vinden en verbeteren",
         "title": "Open AED-kaart"
     },
-    "aed_brugge": {
-        "description": "Op deze kaart kan je informatie over AEDs vinden en verbeteren + een export van de brugse defibrillatoren",
-        "title": "Open AED-kaart - Brugge edition"
-    },
     "artwork": {
         "description": "Een vrije kaart met standbeelden, bustes, graffiti en andere kunstwerken van over de hele wereld",
         "title": "Open kunstwerken-kaart"
@@ -790,7 +786,7 @@
         "title": "Brandkranen, brandblussers, brandweerposten en ambulanceposten"
     },
     "healthcare": {
-        "description": "Op deze kaart vind je dokters en apothekers",
+        "description": "Op deze kaart vind je dokters, apothekers, kinesisten, ziekenhuizen en andere gezondheidsgerelateerde diensten",
         "title": "Gezondheidszorg"
     },
     "hotels": {
@@ -813,11 +809,6 @@
         "shortDescription": "Deze kaart toont de maximumsnelheid voor elke straat.",
         "title": "Maximale snelheden"
     },
-    "missing_streets": {
-        "description": "Dit thema voegt automatisch straatnamen toe aan gebouwen met huisnummer en overeenkomstig CRAB-adres.",
-        "shortDescription": "Voegt ontbrekende straten toe aan gebouwen met huisnumer adhv CRAB",
-        "title": "Fix ontbrekende straten"
-    },
     "nature": {
         "description": "Op deze kaart vind je informatie voor natuurliefhebbers, zoals info over het natuurgebied waar je inzit, vogelkijkhutten, informatieborden, ...",
         "shortDescription": "Deze kaart bevat informatie voor natuurliefhebbers",