From e9bc62c48d1f3025ab8bcc6c6e31dbaf4354eeac Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Mon, 5 Dec 2022 17:59:52 +0000
Subject: [PATCH 01/18] Translated using Weblate (English)

Currently translated at 100.0% (380 of 380 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/en/
---
 langs/themes/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/langs/themes/en.json b/langs/themes/en.json
index 419927176..1f256ce60 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -742,7 +742,7 @@
         "title": "Kerbs and crossings"
     },
     "mapcomplete-changes": {
-        "description": "This maps shows all the changes made with MapComplete",
+        "description": "This map shows all the changes made with MapComplete",
         "layers": {
             "0": {
                 "description": "Shows all MapComplete changes",
@@ -1175,4 +1175,4 @@
         "shortDescription": "A map with waste baskets",
         "title": "Waste Basket"
     }
-}
\ No newline at end of file
+}

From bf0be85dd1728556de55555267060d59e3cd6b1d Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Mon, 5 Dec 2022 18:03:03 +0000
Subject: [PATCH 02/18] Translated using Weblate (German)

Currently translated at 100.0% (380 of 380 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/de/
---
 langs/themes/de.json | 97 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 96 insertions(+), 1 deletion(-)

diff --git a/langs/themes/de.json b/langs/themes/de.json
index 817dbae46..3ada9a44a 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -1079,5 +1079,100 @@
         "description": "Auf dieser Karte findest Du Abfalleimer in Deiner Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, kannst du ihn selbst hinzufügen",
         "shortDescription": "Eine Karte mit Abfalleimern",
         "title": "Abfalleimer"
+    },
+    "mapcomplete-changes": {
+        "title": "Mit MapComplete vorgenommene Änderungen",
+        "layers": {
+            "0": {
+                "filter": {
+                    "0": {
+                        "options": {
+                            "0": {
+                                "question": "Themename enthält {search}"
+                            }
+                        }
+                    },
+                    "2": {
+                        "options": {
+                            "0": {
+                                "question": "<b>Nicht</b> von Mitwirkendem {search}"
+                            }
+                        }
+                    },
+                    "3": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt vor {search}"
+                            }
+                        }
+                    },
+                    "4": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt nach {search}"
+                            }
+                        }
+                    },
+                    "1": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt vom Mitwirkenden {search}"
+                            }
+                        }
+                    },
+                    "5": {
+                        "options": {
+                            "0": {
+                                "question": "Benutzersprache (ISO-Code) {search}"
+                            }
+                        }
+                    },
+                    "6": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt mit host {search}"
+                            }
+                        }
+                    }
+                },
+                "tagRenderings": {
+                    "theme-id": {
+                        "question": "Welches Thema wurde für diese Änderung verwendet?",
+                        "render": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
+                    },
+                    "host": {
+                        "question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?",
+                        "render": "Geändert über <a href='{host}'>{host}</a>"
+                    },
+                    "locale": {
+                        "question": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?",
+                        "render": "Benutzergebietsschema ist {locale}"
+                    },
+                    "contributor": {
+                        "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?",
+                        "render": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
+                    },
+                    "show_changeset_id": {
+                        "render": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
+                    }
+                },
+                "name": "Zentrum der Änderungssätze",
+                "title": {
+                    "render": "Änderungssatz für {theme}"
+                },
+                "description": "Zeigt alle MapComplete-Änderungen"
+            },
+            "1": {
+                "override": {
+                    "tagRenderings": {
+                        "link_to_more": {
+                            "render": "Weitere Statistiken <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
+                        }
+                    }
+                }
+            }
+        },
+        "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
+        "shortDescription": "Zeigt Änderungen, die von MapComplete vorgenommen wurden"
     }
-}
\ No newline at end of file
+}

From d3fd7afdb32a12b7fa8a1f64cbe18b866e4a2c21 Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Mon, 5 Dec 2022 17:59:52 +0000
Subject: [PATCH 03/18] Translated using Weblate (Dutch)

Currently translated at 90.7% (345 of 380 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/nl/
---
 langs/themes/nl.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 2f2e77b89..299864132 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1125,5 +1125,8 @@
         "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen",
         "shortDescription": "Een kaart met vuilnisbakken",
         "title": "Vuilnisbak"
+    },
+    "mapcomplete-changes": {
+        "description": "Deze kaart toont alle wijzigingen gemaakt met MapComplete"
     }
-}
\ No newline at end of file
+}

From 8f831fa55e765ac96a744c05a74516a3644b7aaa Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 5 Dec 2022 17:09:13 +0000
Subject: [PATCH 04/18] Translated using Weblate (Dutch)

Currently translated at 90.7% (345 of 380 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/nl/
---
 langs/themes/nl.json | 145 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 142 insertions(+), 3 deletions(-)

diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 299864132..280bd6e62 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -10,7 +10,52 @@
     "bag": {
         "description": "Dit thema helpt het importeren van BAG data",
         "shortDescription": "BAG import helper tool",
-        "title": "BAG import helper"
+        "title": "BAG import helper",
+        "layers": {
+            "0": {
+                "tagRenderings": {
+                    "Reference": {
+                        "mappings": {
+                            "0": {
+                                "then": "Dit gebouw heeft geen referentie in de BAG"
+                            }
+                        },
+                        "render": "De referentie in BAG is <b>{ref:bag}</b>"
+                    }
+                }
+            },
+            "2": {
+                "description": "Gebouw uit de BAG",
+                "tagRenderings": {
+                    "Building type": {
+                        "render": "Het gebouwtype is <b>{_bag_obj:building}</b>",
+                        "mappings": {
+                            "0": {
+                                "then": "Het gebouwtype wordt <b>{_bag_obj:construction}</b>"
+                            }
+                        }
+                    },
+                    "Import button": {
+                        "mappings": {
+                            "0": {
+                                "then": "Correcte waarden nog niet berekend. Herlaad deze pagina"
+                            }
+                        }
+                    },
+                    "Reference": {
+                        "render": "De referentie in BAG is <b>{_bag_obj:ref:bag}</b>"
+                    },
+                    "Build year": {
+                        "mappings": {
+                            "0": {
+                                "then": "De bouw van dit gebouw is gestart in <b>{_bag_obj:start_date}</b>"
+                            }
+                        },
+                        "render": "Dit gebouw is gebouwd in <b>{_bag_obj:start_date}</b>"
+                    }
+                }
+            }
+        }
     },
     "benches": {
         "description": "Deze kaart toont alle zitbanken die zijn opgenomen in OpenStreetMap: individuele banken en banken bij bushaltes. Met een OpenStreetMap-account kan je informatie verbeteren en nieuwe zitbanken toevoegen.",
@@ -427,6 +472,15 @@
                         },
                         "6": {
                             "then": "Deze straat is geen fietsstraat"
+                        },
+                        "2": {
+                            "then": "Deze straat is een fietsstraat (snelheid van 30 km/h en voertuigen niet toegestaan) (bord wordt later gevraagd)"
+                        },
+                        "1": {
+                            "then": "Deze straat is een fietsstraat"
+                        },
+                        "5": {
+                            "then": "Deze straat wordt binnenkort een fietsstraat"
                         }
                     },
                     "question": "Is de straat <b>{name}</b> een fietsstraat?"
@@ -434,6 +488,26 @@
                 "2": {
                     "question": "Wanneer wordt deze straat een fietsstraat?",
                     "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}"
+                },
+                "1": {
+                    "mappings": {
+                        "2": {
+                            "then": "Motoren toegestaan"
+                        },
+                        "3": {
+                            "then": "Auto's toegestaan"
+                        },
+                        "4": {
+                            "then": "Er zijn geen onderborden bij deze fietsstraat."
+                        },
+                        "0": {
+                            "then": "Aanwonenden toegestaan"
+                        },
+                        "1": {
+                            "then": "Motorvoertuigen toegestaan"
+                        }
+                    },
+                    "question": "Welk bord heeft deze fietsstraat?"
                 }
             }
         },
@@ -794,7 +868,8 @@
         "title": "Hotels"
     },
     "indoors": {
-        "title": "Binnenruimtes"
+        "title": "Binnenruimtes",
+        "description": "Op deze kaart worden publiek toegankelijke binnenruimtes getoond"
     },
     "kerbs_and_crossings": {
         "description": "Een kaart met stoepranden en oversteekplaatsen.",
@@ -1127,6 +1202,70 @@
         "title": "Vuilnisbak"
     },
     "mapcomplete-changes": {
-        "description": "Deze kaart toont alle wijzigingen gemaakt met MapComplete"
+        "description": "Deze kaart toont alle wijzigingen gemaakt met MapComplete",
+        "layers": {
+            "0": {
+                "description": "Toon alle MapComplete wijzigingen",
+                "title": {
+                    "render": "Changeset voor {theme}"
+                },
+                "tagRenderings": {
+                    "contributor": {
+                        "render": ""
+                    },
+                    "theme-id": {
+                        "render": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
+                        "question": "Welk thema is gebruikt voor deze wijziging?"
+                    }
+                },
+                "filter": {
+                    "4": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt na {search}"
+                            }
+                        }
+                    },
+                    "3": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt voor {search}"
+                            }
+                        }
+                    },
+                    "2": {
+                        "options": {
+                            "0": {
+                                "question": "<b>Niet</b> gemaakt door {search}"
+                            }
+                        }
+                    },
+                    "6": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt met host {search}"
+                            }
+                        }
+                    },
+                    "1": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt door {search}"
+                            }
+                        }
+                    },
+                    "0": {
+                        "options": {
+                            "0": {
+                                "question": "Themanaam bevat {search}"
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "transit": {
+        "title": "Busroutes"
     }
 }

From 0cd22e4d5823d9612fcc6b9c1a4f05ed75a283b4 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 5 Dec 2022 20:52:08 +0000
Subject: [PATCH 05/18] Translated using Weblate (English)

Currently translated at 100.0% (380 of 380 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/en/
---
 langs/themes/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/langs/themes/en.json b/langs/themes/en.json
index 1f256ce60..697d9c24b 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -805,7 +805,7 @@
                     },
                     "host": {
                         "question": "What host (website) was this change made with?",
-                        "render": "Change with with <a href='{host}'>{host}</a>"
+                        "render": "Change with <a href='{host}'>{host}</a>"
                     },
                     "locale": {
                         "question": "What locale (language) was this change made in?",

From 942069f33976720238c5a4ce5d73b38f771eceac Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 5 Dec 2022 21:10:22 +0000
Subject: [PATCH 06/18] Translated using Weblate (Dutch)

Currently translated at 95.7% (716 of 748 strings)

Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/nl/
---
 langs/nl.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/langs/nl.json b/langs/nl.json
index e5a955f48..f3cdefae0 100644
--- a/langs/nl.json
+++ b/langs/nl.json
@@ -82,7 +82,7 @@
     },
     "general": {
         "about": "Bewerk en voeg data toe aan OpenStreetMap over een specifiek onderwerp op een gemakkelijke manier",
-        "aboutMapcomplete": "<h3>Over MapComplete</h3><p>Met MapComplete kun je OpenStreetMap verrijken met informatie over een bepaald thema. Beantwoord enkele vragen, en binnen een paar minuten is jouw bijdrage wereldwijd beschikbaar! De <b>maker van het thema</b> bepaalt de elementen, vragen en taalversies voor het thema.</p><h3>Ontdek meer</h3><p>MapComplete <b>biedt altijd de volgende stap</b> naar meer OpenStreetMap:</p><ul><li>Indien ingebed in een website linkt het iframe naar de volledige MapComplete</li><li>De volledige versie heeft uitleg over OpenStreetMap</li><li>Bekijken kan altijd, maar wijzigen vereist een OSM-account</li><li>Als je niet aangemeld bent, wordt je gevraagd dit te doen</li><li>Als je minstens één vraag hebt beantwoord, kan je ook elementen toevoegen</li><li>Heb je genoeg changesets, dan verschijnen de OSM-tags, nog later links naar de wiki</li></ul><p></p><p>Merk je <b>een bug</b> of wil je een <b>extra feature</b>? Wil je <b>helpen vertalen</b>? Bezoek dan de <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">broncode</a> en <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">issue tracker</a>. </p><p></p>Wil je <b>je vorderingen</b> zien? Volg de edits <a href=\"{osmcha_link}\" target=\"_blank\">op OsmCha</a>.<p></p>",
+        "aboutMapcomplete": "<h3>Over MapComplete</h3><p>Met MapComplete kun je OpenStreetMap verrijken met informatie over een bepaald thema. Beantwoord enkele vragen, en binnen een paar minuten is jouw bijdrage wereldwijd beschikbaar! In de meeste thema's kan je foto's toevoegen of zelfs een review achterlaten. De <b>maker van het thema</b> bepaalt de elementen, vragen en taalversies voor het thema.</p><h3>Ontdek meer</h3><p>MapComplete <b>biedt altijd de volgende stap</b> naar meer OpenStreetMap:</p><ul><li>Indien ingebed in een website linkt het iframe naar de volledige MapComplete</li><li>De volledige versie heeft uitleg over OpenStreetMap</li><li>Bekijken kan altijd, maar wijzigen vereist een OSM-account</li><li>Als je niet aangemeld bent, wordt je gevraagd dit te doen</li><li>Als je minstens één vraag hebt beantwoord, kan je ook elementen toevoegen</li><li>Heb je genoeg changesets, dan verschijnen de OSM-tags, nog later links naar de wiki</li></ul><p></p><p>Merk je <b>een bug</b> of wil je een <b>extra feature</b>? Wil je <b>helpen vertalen</b>? Bezoek dan de <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">broncode</a> en <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">issue tracker</a>. </p><p></p>Wil je <b>je vorderingen</b> zien? Volg de edits <a href=\"{osmcha_link}\" target=\"_blank\">op OsmCha</a>.<p></p>",
         "add": {
             "addNew": "Voeg {category} toe",
             "addNewMapLabel": "Klik hier om een item toe te voegen",
@@ -317,6 +317,21 @@
             "searchToShort": "Je zoekopdracht is te kort, vul een langere tekst in",
             "searchWikidata": "Zoek op Wikidata",
             "wikipediaboxTitle": "Wikipedia"
+        },
+        "levelSelection": {
+            "confirmLevel": "Ja, voeg {preset} toe op verdieping {level}",
+            "addNewOnLevel": "Is het nieuwe punt op verdieping {level}?"
+        },
+        "uploadGpx": {
+            "confirm": "Bevestig upload",
+            "modes": {
+                "private": {
+                    "name": "Anoniem"
+                },
+                "public": {
+                    "name": "Publiek"
+                }
+            }
         }
     },
     "image": {
@@ -930,5 +945,12 @@
         "wikidata": {
             "description": "Een Wikidata-code"
         }
+    },
+    "plantDetection": {
+        "howTo": {
+            "li0": "neem een foto waar de boom in het midden staat zonder te veel achtergrond",
+            "li1": "neem een foto met een enkel blad",
+            "intro": "Voor optimale resultaten,"
+        }
     }
 }

From c1b56b792906648c9ec98264f86fd6f1fc787e68 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 5 Dec 2022 20:55:37 +0000
Subject: [PATCH 07/18] Translated using Weblate (Dutch)

Currently translated at 96.5% (367 of 380 strings)

Translation: MapComplete/themes
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/themes/nl/
---
 langs/themes/nl.json | 88 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 85 insertions(+), 3 deletions(-)

diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 280bd6e62..c1d3e4423 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -938,6 +938,33 @@
                         }
                     }
                 }
+            },
+            "19": {
+                "override": {
+                    "+tagRenderings": {
+                        "0": {
+                            "render": {
+                                "special": {
+                                    "text": "Importeren"
+                                }
+                            }
+                        },
+                        "1": {
+                            "render": {
+                                "special": {
+                                    "message": "Voeg alle gesuggereerde tags toe"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "18": {
+                "override": {
+                    "=title": {
+                        "render": "Statistieken"
+                    }
+                }
             }
         },
         "title": "OnWheels"
@@ -1041,6 +1068,28 @@
                 "tagRenderings": {
                     "streetname": {
                         "render": "Deze straat heet {name}"
+                    },
+                    "left-right-questions": {
+                        "renderings": {
+                            "1": {
+                                "mappings": {
+                                    "2": {
+                                        "then": "Er is een apart ingetekende stoep om op te lopen"
+                                    },
+                                    "1": {
+                                        "then": "Nee, er is geen stoep om op te lopen"
+                                    },
+                                    "0": {
+                                        "then": "Ja, er is een stoep aan deze kant van de weg"
+                                    }
+                                },
+                                "question": "Is er een stoep aan deze kant van de weg?"
+                            },
+                            "2": {
+                                "question": "Hoe breed is de stoep aan deze kant van de weg?",
+                                "render": "Deze stoep is {sidewalk:left|right:width}m breed"
+                            }
+                        }
                     }
                 },
                 "title": {
@@ -1211,11 +1260,17 @@
                 },
                 "tagRenderings": {
                     "contributor": {
-                        "render": ""
+                        "render": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
                     },
                     "theme-id": {
                         "render": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
                         "question": "Welk thema is gebruikt voor deze wijziging?"
+                    },
+                    "host": {
+                        "render": "Wijziging met <a href='{host}'>{host}</a>"
+                    },
+                    "show_changeset_id": {
+                        "render": "Wijzigingenset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
                     }
                 },
                 "filter": {
@@ -1260,12 +1315,39 @@
                                 "question": "Themanaam bevat {search}"
                             }
                         }
+                    },
+                    "5": {
+                        "options": {
+                            "0": {
+                                "question": "Gebruikerstaal (iso-code) {search}"
+                            }
+                        }
+                    }
+                }
+            },
+            "1": {
+                "override": {
+                    "tagRenderings": {
+                        "link_to_more": {
+                            "render": "Meer statistieken zijn <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> te vinden"
+                        }
                     }
                 }
             }
-        }
+        },
+        "title": "Wijzigingen gemaakt met MapComplete",
+        "shortDescription": "Toont wijzigingen gemaakt met MapComplete"
     },
     "transit": {
-        "title": "Busroutes"
+        "title": "Busroutes",
+        "description": "Plan je trip met behulp van het openbaar vervoer."
+    },
+    "walls_and_buildings": {
+        "title": "Muren en gebouwen",
+        "description": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker."
+    },
+    "maproulette": {
+        "title": "MapRoulette taken",
+        "description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen."
     }
 }

From 62d201e961c644704be8db8297c2b0737093ab83 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 5 Dec 2022 16:54:02 +0000
Subject: [PATCH 08/18] Translated using Weblate (English)

Currently translated at 100.0% (2488 of 2488 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/en/
---
 langs/layers/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/langs/layers/en.json b/langs/layers/en.json
index bcc2de837..e173cb87b 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4548,7 +4548,7 @@
     },
     "indoors": {
         "description": "Basic indoor mapping: shows room outlines",
-        "name": "indoors",
+        "name": "Indoors",
         "tagRenderings": {
             "name": {
                 "freeform": {
@@ -5584,7 +5584,7 @@
                 }
             }
         },
-        "name": "pharmacy",
+        "name": "Pharmacies",
         "presets": {
             "0": {
                 "title": "a pharmacy"
@@ -8117,4 +8117,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 35d05efab846d2b2a2be18af03ed0c7c6bac2f73 Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Mon, 5 Dec 2022 18:04:24 +0000
Subject: [PATCH 09/18] Translated using Weblate (German)

Currently translated at 99.6% (2479 of 2488 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/
---
 langs/layers/de.json | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/langs/layers/de.json b/langs/layers/de.json
index b78ae0210..069719d0b 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -5540,7 +5540,7 @@
                 }
             }
         },
-        "name": "Apotheke",
+        "name": "Apotheken",
         "presets": {
             "0": {
                 "title": "eine Apotheke"
@@ -6463,6 +6463,20 @@
             "shops-name": {
                 "question": "Wie ist der Name dieses Geschäfts?",
                 "render": "Der Name des Geschäfts lautet <i>{name}</i>"
+            },
+            "organic": {
+                "mappings": {
+                    "1": {
+                        "then": "Dieses Geschäft bietet ausschließlich Bio-Produkte an"
+                    },
+                    "2": {
+                        "then": "Dieses Geschäft bietet keine Bioprodukte an"
+                    },
+                    "0": {
+                        "then": "Dieses Geschäft bietet Bio-Produkte an"
+                    }
+                },
+                "question": "Bietet dieses Geschäft Bioprodukte an?"
             }
         },
         "title": {
@@ -7376,6 +7390,11 @@
             "wheelchair-door-width": {
                 "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?",
                 "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit"
+            },
+            "opening_hours": {
+                "override": {
+                    "question": "Wann ist die Einrichtung, in der sich die Toilette befindet, geöffnet?"
+                }
             }
         },
         "title": {
@@ -8043,4 +8062,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 776e0ebe24f2adbdf2062093f5da6d9e71524349 Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Mon, 5 Dec 2022 16:59:16 +0000
Subject: [PATCH 10/18] Translated using Weblate (Dutch)

Currently translated at 92.5% (2302 of 2488 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/nl/
---
 langs/layers/nl.json | 79 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index bb2a0b001..0d2466315 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1925,7 +1925,7 @@
                     }
                 },
                 "question": "Welk vermogen levert een enkele stekker van type <div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (een type2 CCS met Tesla-logo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div>?",
-                "render": "<div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (een type2 CCS met Tesla-logo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> levert een vermogen van maximaal {socket:tesla_supercharger_ccs:output}"
+                "render": "<div style='display: inline-block'><div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (een type2 CCS met Tesla-logo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> levert een vermogen van maximaal {socket:tesla_supercharger_ccs:output}"
             },
             "power-output-11": {
                 "mappings": {
@@ -2445,7 +2445,6 @@
         },
         "title": {
             "mappings": {
-                "0": {},
                 "1": {
                     "then": "Klimsite <b>{name}</b>"
                 },
@@ -3665,6 +3664,13 @@
                         "question": "Geen informatie over voelbare bestrating"
                     }
                 }
+            },
+            "6": {
+                "options": {
+                    "0": {
+                        "question": "Heeft biologische opties"
+                    }
+                }
             }
         }
     },
@@ -3986,6 +3992,20 @@
                     }
                 },
                 "question": "Heeft dit restaurant halal opties?"
+            },
+            "organic (no friture)": {
+                "question": "Biedt dit restaurant biologisch eten?",
+                "mappings": {
+                    "2": {
+                        "then": "Er zijn alleen biologische opties beschikbaar"
+                    },
+                    "0": {
+                        "then": "Er zijn geen biologische opties beschikbaar"
+                    },
+                    "1": {
+                        "then": "Er is een biologisch menu"
+                    }
+                }
             }
         },
         "title": {
@@ -5325,7 +5345,7 @@
                 }
             }
         },
-        "name": "apotheek",
+        "name": "Apotheken",
         "presets": {
             "0": {
                 "title": "een apotheek"
@@ -7195,6 +7215,43 @@
                     }
                 },
                 "question": "Heeft deze halte een vuilnisbak?"
+            },
+            "lit": {
+                "mappings": {
+                    "0": {
+                        "then": "Deze halte is niet verlicht"
+                    },
+                    "1": {
+                        "then": "Deze halte is niet verlicht"
+                    }
+                },
+                "question": "Is deze halte verlicht?"
+            },
+            "shelter": {
+                "mappings": {
+                    "2": {
+                        "then": "Deze halte heeft een schuilplaats, die apart op de kaart staat"
+                    },
+                    "1": {
+                        "then": "Deze halte heeft geen schuilplaats"
+                    },
+                    "0": {
+                        "then": "Deze halte heeft een schuilplaats"
+                    }
+                },
+                "question": "Heeft deze halte een schuilplaats?"
+            },
+            "stop_name": {
+                "render": "Deze halte heet <b>{name}</b>",
+                "freeform": {
+                    "placeholder": "Naam van de halte"
+                },
+                "mappings": {
+                    "0": {
+                        "then": "Deze halte heeft geen naam"
+                    }
+                },
+                "question": "Wat is de naam van deze halte?"
             }
         },
         "title": {
@@ -7393,7 +7450,7 @@
         }
     },
     "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.",
+        "description": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker.",
         "tagRenderings": {
             "entrance_info": {
                 "render": {
@@ -7405,6 +7462,18 @@
         },
         "title": {
             "render": "Muur of gebouw"
+        },
+        "units": {
+            "0": {
+                "applicableUnits": {
+                    "0": {
+                        "human": "meter"
+                    },
+                    "1": {
+                        "human": "centimeter"
+                    }
+                }
+            }
         }
     },
     "waste_basket": {
@@ -7672,4 +7741,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From e30650f2ace64255a194f532b21359457356c42b Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn+mapcomplete@posteo.net>
Date: Mon, 5 Dec 2022 23:55:47 +0000
Subject: [PATCH 11/18] Translated using Weblate (Dutch)

Currently translated at 92.5% (2312 of 2498 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/nl/
---
 langs/layers/nl.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 0d2466315..17e1c030b 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -6183,6 +6183,20 @@
             "shops-name": {
                 "question": "Wat is de naam van deze winkel?",
                 "render": "Deze zaak heet <i>{name}</i>"
+            },
+            "organic": {
+                "mappings": {
+                    "1": {
+                        "then": "Deze winkel biedt uitluitend biologische producten aan"
+                    },
+                    "0": {
+                        "then": "Deze winkel biedt biologische producten aan"
+                    },
+                    "2": {
+                        "then": "Deze winkel heeft geen biologische producten"
+                    }
+                },
+                "question": "Biedt deze winkel biologische producten aan?"
             }
         },
         "title": {

From e649e7274855ab80f453231722bb8b4567cb7d07 Mon Sep 17 00:00:00 2001
From: mcliquid <info@mcliquid.de>
Date: Tue, 6 Dec 2022 08:23:28 +0000
Subject: [PATCH 12/18] Translated using Weblate (German)

Currently translated at 100.0% (2498 of 2498 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/de/
---
 langs/layers/de.json | 57 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/langs/layers/de.json b/langs/layers/de.json
index 069719d0b..45ae55af8 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -3281,6 +3281,14 @@
         },
         "title": {
             "render": "Arztpraxis {name}"
+        },
+        "description": "Diese Ebene zeigt Zahnarztpraxen",
+        "name": "Zahnarzt",
+        "tagRenderings": {
+            "name": {
+                "render": "Dieser Zahnarzt heißt {name}",
+                "question": "Wie lautet der Name dieses Zahnarztes?"
+            }
         }
     },
     "direction": {
@@ -3320,7 +3328,8 @@
         },
         "title": {
             "render": "Arztpraxis {name}"
-        }
+        },
+        "description": "Diese Ebene zeigt Arztpraxen, Zahnärzte und andere Gesundheitseinrichtungen"
     },
     "dogpark": {
         "name": "Hundeparks",
@@ -3726,6 +3735,13 @@
                         "question": "Keine Informationen über taktiles Pflaster"
                     }
                 }
+            },
+            "6": {
+                "options": {
+                    "0": {
+                        "question": "Hat Bio-Produkte"
+                    }
+                }
             }
         }
     },
@@ -4177,6 +4193,34 @@
                     }
                 },
                 "question": "Werden hier halal Gerichte angeboten?"
+            },
+            "friture-organic": {
+                "mappings": {
+                    "1": {
+                        "then": "Es sind keine biologischen Snacks erhältlich"
+                    },
+                    "2": {
+                        "then": "Nur biologische Snacks sind erhältlich"
+                    },
+                    "0": {
+                        "then": "Biologische Snacks sind erhältlich"
+                    }
+                },
+                "question": "Bietet diese Pommesbude biologische Snacks an?"
+            },
+            "organic (no friture)": {
+                "mappings": {
+                    "0": {
+                        "then": "Es sind keine biologischen Produkte verfügbar"
+                    },
+                    "1": {
+                        "then": "Es gibt ein biologisches Menü"
+                    },
+                    "2": {
+                        "then": "Nur biologische Produkte sind erhältlich"
+                    }
+                },
+                "question": "Bietet dieses Restaurant biologische Speisen an?"
             }
         },
         "title": {
@@ -5583,6 +5627,17 @@
             "0": {
                 "title": "Praxis eines Physiotherapeuten"
             }
+        },
+        "name": "Physiotherapeut",
+        "title": {
+            "render": "Physiotherapeut {name}"
+        },
+        "description": "Diese Ebene zeigt Physiotherapeuten",
+        "tagRenderings": {
+            "name": {
+                "question": "Wie heißt die Praxis des Physiotherapeuten?",
+                "render": "Die Praxis des Physiotherapeuten heißt {name}"
+            }
         }
     },
     "picnic_table": {

From 9a2cf927169ecd7e20e24b73fd219e5e0a1e9b61 Mon Sep 17 00:00:00 2001
From: Lucas <lucaslechat@gmail.com>
Date: Tue, 6 Dec 2022 13:49:51 +0000
Subject: [PATCH 13/18] Translated using Weblate (French)

Currently translated at 46.2% (346 of 748 strings)

Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/fr/
---
 langs/fr.json | 114 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 3 deletions(-)

diff --git a/langs/fr.json b/langs/fr.json
index 905ab107e..e75a58d0e 100644
--- a/langs/fr.json
+++ b/langs/fr.json
@@ -269,7 +269,18 @@
             "searchToShort": "Votre requête est trop courte, entrez un texte plus long.",
             "searchWikidata": "Rechercher sur Wikidata",
             "wikipediaboxTitle": "Wikipédia"
-        }
+        },
+        "uploadGpx": {
+            "modes": {
+                "private": {
+                    "name": "Anonyme"
+                },
+                "public": {
+                    "name": "Publique"
+                }
+            }
+        },
+        "noMatchingMapping": "Aucun résultat ne correspond à votre recherche…"
     },
     "image": {
         "addPicture": "Ajoutez une photo",
@@ -281,7 +292,17 @@
         "dontDelete": "Annuler",
         "isDeleted": "Supprimé",
         "nearbyPictures": {
-            "browseNearby": "Parcourir les images à proximité…"
+            "browseNearby": "Parcourir les images à proximité…",
+            "loadMore": "Charger plus d'images",
+            "removeFilters": "Cliquez ici pour retirer les filtres",
+            "title": "Images à proximité",
+            "withinRadius": "N'afficher que les images prises dans un rayon de {radius} mètres autour de cet objet",
+            "loading": "Chargement des images alentours…",
+            "confirm": "L'image sélectionnée représente {title()}",
+            "allFiltered": "Aucune image ne correspond à votre filtre",
+            "hasMatchingPicture": "Est-ce qu'une image correspond à cet objet ? Sélectionnez ci-dessous",
+            "noImageSelected": "Sélectionnez une image à lier à l'objet",
+            "nothingFound": "Aucune image trouvée à proximité…"
         },
         "pleaseLogin": "Connectez-vous pour téléverser une photo",
         "respectPrivacy": "Ne photographiez ni les personnes ni les plaques d'immatriculation. Ne téléversez rien issu de Google Maps, Google Streetview ou d'autre sources soumises à des droits d'auteurs.",
@@ -295,7 +316,9 @@
     },
     "importHelper": {
         "askMetadata": {
-            "shouldBeUrl": "URL invalide"
+            "shouldBeUrl": "URL invalide",
+            "intro": "Avant d'ajouter {count} notes, merci de fournir quelques informations supplémentaires.",
+            "giveDescription": "Merci d'écrire une petite description pour la personne qui lira la note. Une bonne note décrit ce que le contributeur devra faire, par ex. <i>Il pourrait y avoir un banc ici. Si vous êtes dans le coin, pouvez-vous vérifier et indiquer si le banc est présent ou non ?</i> (Un lien vers MapComplete sera ajouté automatiquement)"
         },
         "login": {
             "loginRequired": "Connectez-vous pour continuer",
@@ -375,5 +398,90 @@
     "translations": {
         "isTranslator": "Mode traduction activé, votre pseudo correspond à celui d’une personne de l’équipe de traduction",
         "missing": "{count} segments non traduits"
+    },
+    "notes": {
+        "reopenNote": "Rouvrir la note",
+        "textNeeded": "Saisir un texte descriptif pour créer une note",
+        "warnAnonymous": "Vous n'êtes pas connecté. Nous ne pourrons pas vous contacter pour résoudre ce problème.",
+        "reopenNoteAndComment": "Rouvrir la note et commenter"
+    },
+    "validation": {
+        "email": {
+            "noAt": "Une adresse email doit contenir un @"
+        },
+        "url": {
+            "feedback": "Ceci n'est pas une adresse web valide",
+            "description": "lien vers un site web"
+        },
+        "int": {
+            "description": "un nombre entier"
+        },
+        "nat": {
+            "notANumber": "Entrez un nombre",
+            "mustBePositive": "Ce nombre doit être positif",
+            "mustBeWhole": "Seuls les nombres entiers sont autorisés"
+        },
+        "opening_hours": {
+            "description": "Horaires d'ouverture"
+        },
+        "tooLong": "",
+        "float": {
+            "description": "un nombre",
+            "feedback": "Ceci n'est pas un nombre"
+        },
+        "pfloat": {
+            "description": "un nombre positif"
+        },
+        "phone": {
+            "description": "un numéro de téléphone",
+            "feedback": "Ceci n'est pas un numéro de téléphone valide"
+        },
+        "pnat": {
+            "description": "un nombre entier, positif",
+            "noZero": "Zéro n'est pas autorisé"
+        }
+    },
+    "matrixbot": {
+        "commands": {
+            "dm": {
+                "failed": "Je n'ai pas pu exécuter <code>{cmd}</code> à cause de {message}"
+            },
+            "documentation": {
+                "file": {
+                    "singular": "fichier",
+                    "plural": "fichiers"
+                },
+                "theme": {
+                    "plural": "thèmes",
+                    "singular": "thème"
+                }
+            }
+        }
+    },
+    "privacy": {
+        "geodataTitle": "Votre géolocalisation",
+        "miscCookiesTitle": "Autres cookies",
+        "trackingTitle": "Données statistiques"
+    },
+    "plantDetection": {
+        "seeInfo": "Voir plus d'informations sur les espèces",
+        "howTo": {
+            "li3": "prenez une photo des fleurs",
+            "li0": "prenez une photo montant l'arbre au centre avec un peu d'élément à l'arrière plan",
+            "li1": "prenez une photo montrant une feuille seule",
+            "li2": "prenez une photo montant l'écorce",
+            "intro": "Pour de résultats optimaux,"
+        },
+        "loadingWikidata": "Chargement des infos sur {species}",
+        "matchPercentage": "Correspondance {match} %",
+        "overviewIntro": "L'IA de <a href='https://plantnet.org/' target='_blank'>PlantNet.org</a> pense que les images représentes les espèces ci-dessous.",
+        "error": "Une erreur est survenue lors de la détection de l'espèce de l'arbre : {error}"
+    },
+    "flyer": {
+        "fakeui": {
+            "edit": "Une info fausse ou pas à jour ? Le bouton de modification est juste ici"
+        },
+        "description": "Un flyer format A4 paysage pour promouvoir MapComplete",
+        "title": "MapComplete.osm.be"
     }
 }

From ca707558865fb2bb0ab32a92e0f74b8a4afc8fe4 Mon Sep 17 00:00:00 2001
From: mcliquid <info@mcliquid.de>
Date: Tue, 6 Dec 2022 08:21:49 +0000
Subject: [PATCH 14/18] Translated using Weblate (German)

Currently translated at 100.0% (63 of 63 strings)

Translation: MapComplete/shared-questions
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/shared-questions/de/
---
 langs/shared-questions/de.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json
index a3a7b1b36..6e0ebd185 100644
--- a/langs/shared-questions/de.json
+++ b/langs/shared-questions/de.json
@@ -210,6 +210,18 @@
                 }
             },
             "question": "Wie lautet der zugehörige Wikipedia Artikel?"
+        },
+        "opening_hours_by_appointment": {
+            "override": {
+                "mappings": {
+                    "0": {
+                        "then": "Nur nach Vereinbarung"
+                    },
+                    "1": {
+                        "then": "Nur nach Vereinbarung"
+                    }
+                }
+            }
         }
     }
-}
\ No newline at end of file
+}

From 1ab5a9eefa652151505090aecc84dd429825b68a Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Wed, 7 Dec 2022 09:48:39 +0100
Subject: [PATCH 15/18] Update translation files

Updated by "Remove blank strings" hook in Weblate.

Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/
---
 langs/fr.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/langs/fr.json b/langs/fr.json
index e75a58d0e..59a7beca9 100644
--- a/langs/fr.json
+++ b/langs/fr.json
@@ -424,7 +424,6 @@
         "opening_hours": {
             "description": "Horaires d'ouverture"
         },
-        "tooLong": "",
         "float": {
             "description": "un nombre",
             "feedback": "Ceci n'est pas un nombre"

From a03e0e480ef4dd0080b2ba33848bff8f8a8d740f Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn+mapcomplete@posteo.net>
Date: Wed, 7 Dec 2022 22:41:54 +0000
Subject: [PATCH 16/18] Translated using Weblate (Dutch)

Currently translated at 92.5% (2312 of 2498 strings)

Translation: MapComplete/Layer translations
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/layers/nl/
---
 langs/layers/nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 17e1c030b..2708737ad 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -2429,7 +2429,7 @@
             "Type": {
                 "mappings": {
                     "0": {
-                        "then": "Een klimboulder- eenn enkele rots of klif met één of enkele klimroutes die veilig zonder touw kunnen worden beklommen"
+                        "then": "Een klimboulder - een enkele rots of klif met één of enkele klimroutes die veilig zonder touw kunnen worden beklommen"
                     }
                 }
             },

From 420f24f76f3871042f4d45806947bd4b5fffde0e Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 8 Dec 2022 02:59:44 +0100
Subject: [PATCH 17/18] Housekeeping...

---
 Customizations/AllKnownLayouts.ts             |   9 +-
 Docs/BuiltinIndex.md                          |  23 +-
 Docs/BuiltinLayers.md                         |   4 +-
 Docs/BuiltinQuestions.md                      |  17 +
 Docs/Layers/all_streets.md                    |   4 +-
 Docs/Layers/artwork.md                        |   2 +-
 Docs/Layers/barrier.md                        |  10 +-
 Docs/Layers/bicycle_rental.md                 |  20 +-
 Docs/Layers/bicycle_rental_non_docking.md     |  20 +-
 Docs/Layers/bike_cleaning.md                  |   2 +-
 Docs/Layers/bike_parking.md                   |   2 +-
 Docs/Layers/bike_repair_station.md            |  12 +-
 Docs/Layers/bike_shop.md                      |  16 +-
 Docs/Layers/cafe_pub.md                       |   4 +-
 Docs/Layers/caravansites.md                   |   4 +-
 Docs/Layers/charging_station.md               | 138 ++---
 Docs/Layers/charging_station_ebikes.md        | 138 ++---
 Docs/Layers/climbing.md                       |   4 +-
 Docs/Layers/climbing_area.md                  |   6 +-
 Docs/Layers/climbing_gym.md                   |   4 +-
 Docs/Layers/climbing_opportunity.md           |   2 +-
 Docs/Layers/crossings.md                      |  24 +-
 .../cultural_places_without_etymology.md      |   2 +-
 Docs/Layers/cycleways_and_roads.md            |  18 +-
 Docs/Layers/defibrillator.md                  |   4 +-
 Docs/Layers/dentist.md                        | 170 ++++++
 Docs/Layers/doctors.md                        |  51 +-
 Docs/Layers/dogfoodb.md                       |  50 +-
 Docs/Layers/dogshop.md                        |  26 +-
 Docs/Layers/drinking_water.md                 |   2 +-
 Docs/Layers/dumpstations.md                   |   2 +-
 ...ducation_institutions_without_etymology.md |   2 +-
 Docs/Layers/etymology.md                      |   2 +-
 Docs/Layers/fietsstraat.md                    |   4 +-
 Docs/Layers/food.md                           |  50 +-
 Docs/Layers/friture.md                        |  50 +-
 ...lth_and_social_places_without_etymology.md |   2 +-
 Docs/Layers/hotel.md                          |   4 +-
 Docs/Layers/indoors.md                        |   4 +-
 Docs/Layers/kerbs.md                          |   4 +-
 Docs/Layers/kindergarten_childcare.md         |   2 +-
 Docs/Layers/map.md                            |   2 +-
 Docs/Layers/maproulette.md                    |   2 +-
 Docs/Layers/maproulette_challenge.md          |   2 +-
 Docs/Layers/nature_reserve.md                 |   2 +-
 Docs/Layers/observation_tower.md              |  10 +-
 Docs/Layers/osm_community_index.md            |   4 +-
 Docs/Layers/parcel_lockers.md                 |   4 +-
 .../parks_and_forests_without_etymology.md    |   2 +-
 Docs/Layers/physiotherapist.md                | 177 ++++++
 Docs/Layers/postoffices.md                    |   4 +-
 Docs/Layers/public_bookcase.md                |   4 +-
 Docs/Layers/rainbow_crossing_high_zoom.md     |   2 +-
 Docs/Layers/rainbow_crossings.md              |   2 +-
 Docs/Layers/recycling.md                      |  10 +-
 Docs/Layers/school.md                         |   4 +-
 Docs/Layers/shops.md                          |  27 +-
 Docs/Layers/speed_camera.md                   |   2 +-
 Docs/Layers/sport_pitch.md                    |   2 +-
 Docs/Layers/sport_places_without_etymology.md |   2 +-
 Docs/Layers/sport_shops.md                    | 547 ++++++++++++++++++
 Docs/Layers/stairs.md                         |   4 +-
 Docs/Layers/street_lamps.md                   |   6 +-
 Docs/Layers/streets_without_etymology.md      |   2 +-
 Docs/Layers/surveillance_camera.md            |   4 +-
 Docs/Layers/tertiary_education.md             |   2 +-
 Docs/Layers/toekomstige_fietsstraat.md        |   4 +-
 Docs/Layers/toilet.md                         |   8 +-
 Docs/Layers/toilet_at_amenity.md              |   6 +-
 .../toursistic_places_without_etymology.md    |   2 +-
 Docs/Layers/transit_stops.md                  |   2 +-
 Docs/Layers/tree_node.md                      |  12 +-
 Docs/Layers/walls_and_buildings.md            |   2 +-
 Docs/TagInfo/mapcomplete_food.json            |  30 +
 Docs/TagInfo/mapcomplete_fritures.json        |  30 +
 Docs/TagInfo/mapcomplete_healthcare.json      | 174 +++++-
 Docs/TagInfo/mapcomplete_indoors.json         |  22 +-
 Docs/TagInfo/mapcomplete_onwheels.json        | 104 +++-
 Docs/TagInfo/mapcomplete_personal.json        | 237 ++++++--
 Docs/TagInfo/mapcomplete_pets.json            |  45 ++
 Docs/TagInfo/mapcomplete_shops.json           |  47 +-
 Docs/TagInfo/mapcomplete_sports.json          |  15 +
 Docs/Themes/healthcare.md                     |   2 +
 Docs/Themes/maproulette.md                    |   1 +
 Docs/Themes/personal.md                       |   2 +
 Docs/Themes/sports.md                         |   2 +-
 Docs/Themes/transit.md                        |   1 +
 Docs/Themes/walls_and_buildings.md            |   1 +
 Docs/wikiIndex.txt                            |   4 +-
 assets/contributors.json                      |  12 +-
 .../charging_station/charging_station.json    |   2 +-
 .../layers/climbing_area/climbing_area.json   |   2 +-
 assets/layers/dentist/dentist.json            |  16 +-
 assets/layers/doctors/doctors.json            |   9 +-
 assets/layers/filters/filters.json            |   4 +-
 assets/layers/food/food.json                  |  28 +-
 assets/layers/indoors/indoors.json            |   2 +-
 assets/layers/pharmacy/pharmacy.json          |   6 +-
 .../physiotherapist/physiotherapist.json      |  18 +-
 assets/layers/shops/shops.json                |  16 +-
 .../layers/transit_stops/transit_stops.json   |  33 +-
 .../walls_and_buildings.json                  |   8 +-
 assets/tagRenderings/questions.json           |   8 +-
 assets/themes/bag/bag.json                    |  27 +-
 assets/themes/cyclestreets/cyclestreets.json  |  27 +-
 assets/themes/healthcare/healthcare.json      |   2 +-
 assets/themes/indoors/indoors.json            |   3 +-
 assets/themes/maproulette/maproulette.json    |   6 +-
 assets/themes/onwheels/onwheels.json          |   9 +-
 assets/themes/sidewalks/sidewalks.json        |  18 +-
 assets/themes/sports/sports.json              |   2 +-
 assets/themes/transit/transit.json            |   6 +-
 .../walls_and_buildings.json                  |   6 +-
 assets/translators.json                       |  18 +-
 langs/fr.json                                 | 158 ++---
 langs/layers/de.json                          |  77 ++-
 langs/layers/en.json                          |   2 +-
 langs/layers/nl.json                          |  39 +-
 langs/nl.json                                 |  44 +-
 langs/shared-questions/de.json                |  26 +-
 langs/themes/de.json                          | 192 +++---
 langs/themes/en.json                          |   2 +-
 langs/themes/nl.json                          | 298 +++++-----
 scripts/generateDocs.ts                       |  11 +-
 124 files changed, 2637 insertions(+), 996 deletions(-)
 create mode 100644 Docs/Layers/dentist.md
 create mode 100644 Docs/Layers/physiotherapist.md
 create mode 100644 Docs/Layers/sport_shops.md

diff --git a/Customizations/AllKnownLayouts.ts b/Customizations/AllKnownLayouts.ts
index 8a739cf32..062eccc42 100644
--- a/Customizations/AllKnownLayouts.ts
+++ b/Customizations/AllKnownLayouts.ts
@@ -218,10 +218,13 @@ export class AllKnownLayouts {
             new Title(new Combine([theme.title, "(", theme.id + ")"]), 2),
             theme.description,
             "This theme contains the following layers:",
-            new List(theme.layers.filter(l => !l.id.startsWith("note_import_")).map((l) =>
-                new Link(l.id, "../Layers/"+l.id+".md"))),
+            new List(
+                theme.layers
+                    .filter((l) => !l.id.startsWith("note_import_"))
+                    .map((l) => new Link(l.id, "../Layers/" + l.id + ".md"))
+            ),
             "Available languages:",
-            new List(theme.language.filter(ln => ln !== "_context")),
+            new List(theme.language.filter((ln) => ln !== "_context")),
         ]).SetClass("flex flex-col")
     }
 
diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md
index 1937b344b..db1c37fb6 100644
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@@ -39,6 +39,7 @@
     + [climbing.sportclimbing](#climbingsportclimbing)
     + [climbing.max_bolts](#climbingmax_bolts)
     + [all_tags](#all_tags)
+    + [opening_hours_by_appointment](#opening_hours_by_appointment)
     + [multilevels](#multilevels)
     + [induction-loop](#induction-loop)
     + [questions](#questions)
@@ -95,6 +96,7 @@
   - climbing_route
   - crossings
   - defibrillator
+  - dentist
   - doctors
   - dogpark
   - drinking_water
@@ -119,6 +121,7 @@
   - parcel_lockers
   - parking
   - pharmacy
+  - physiotherapist
   - picnic_table
   - play_forest
   - playground
@@ -176,6 +179,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
+  - dentist
   - doctors
   - fitness_centre
   - food
@@ -187,6 +191,7 @@
   - nature_reserve
   - observation_tower
   - pharmacy
+  - physiotherapist
   - playground
   - recycling
   - school
@@ -212,6 +217,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
+  - dentist
   - doctors
   - fitness_centre
   - food
@@ -221,6 +227,7 @@
   - hotel
   - kindergarten_childcare
   - pharmacy
+  - physiotherapist
   - recycling
   - school
   - shops
@@ -245,6 +252,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
+  - dentist
   - doctors
   - fitness_centre
   - food
@@ -254,6 +262,7 @@
   - hotel
   - kindergarten_childcare
   - pharmacy
+  - physiotherapist
   - recycling
   - school
   - shops
@@ -277,7 +286,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
-  - doctors
+  - dentist
   - fitness_centre
   - fitness_station
   - food
@@ -612,6 +621,18 @@
 
 
 
+### opening_hours_by_appointment 
+
+
+
+
+
+  - doctors
+  - physiotherapist
+
+
+
+
 ### multilevels 
 
 
diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index f8ad51c5f..3650c1b00 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -463,7 +463,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_opened_by_anonymous_user=false`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_opened_by_anonymous_user=false`
 
 
 
@@ -817,6 +817,7 @@ The following layers are included in MapComplete:
   - [current_view](./Layers/current_view.md)
   - [cycleways_and_roads](./Layers/cycleways_and_roads.md)
   - [defibrillator](./Layers/defibrillator.md)
+  - [dentist](./Layers/dentist.md)
   - [direction](./Layers/direction.md)
   - [doctors](./Layers/doctors.md)
   - [dogpark](./Layers/dogpark.md)
@@ -863,6 +864,7 @@ The following layers are included in MapComplete:
   - [parking_spaces](./Layers/parking_spaces.md)
   - [pedestrian_path](./Layers/pedestrian_path.md)
   - [pharmacy](./Layers/pharmacy.md)
+  - [physiotherapist](./Layers/physiotherapist.md)
   - [picnic_table](./Layers/picnic_table.md)
   - [play_forest](./Layers/play_forest.md)
   - [playground](./Layers/playground.md)
diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md
index 57d992084..9ab5e122c 100644
--- a/Docs/BuiltinQuestions.md
+++ b/Docs/BuiltinQuestions.md
@@ -28,6 +28,7 @@ The following items can be easily reused in your layers
     + [description](#description)
     + [opening_hours](#opening_hours)
     + [opening_hours_24_7](#opening_hours_24_7)
+    + [opening_hours_by_appointment](#opening_hours_by_appointment)
     + [service:electricity](#serviceelectricity)
     + [payment-options](#payment-options)
     + [payment-options-advanced](#payment-options-advanced)
@@ -279,6 +280,22 @@ What are the opening hours of {title()}?
 
 
 
+### opening_hours_by_appointment 
+
+
+
+<h3>Opening hours</h3>{opening_hours_table(opening_hours)}
+
+What are the opening hours of {title()}?
+
+
+
+  - Only by appointment
+  - Only by appointment
+
+
+
+
 ### service:electricity 
 
 
diff --git a/Docs/Layers/all_streets.md b/Docs/Layers/all_streets.md
index 03367f1c2..a04a867b8 100644
--- a/Docs/Layers/all_streets.md
+++ b/Docs/Layers/all_streets.md
@@ -117,7 +117,7 @@ The question is  What sign does this bicycle road have?
   - There are no supplementary signs at this bicycle road.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DDE:244.1' target='_blank'>DE:244.1</a>`
 
 
-Only visible if  `bicycle_road=yes&_country=de`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `bicycle_road=yes&_country=de`
 
 
 
@@ -133,7 +133,7 @@ This is rendered with  This street will become a cyclestreet at {cyclestreet:sta
 
 
 
-Only visible if  `proposed:cyclestreet=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `proposed:cyclestreet=yes`
 
 
 
diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md
index 4d7e679e3..0459a8736 100644
--- a/Docs/Layers/artwork.md
+++ b/Docs/Layers/artwork.md
@@ -191,6 +191,6 @@ This is rendered with  This artwork depicts {wikidata_label(subject:wikidata)}{w
 
 
 
-Only visible if  `subject:wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `subject:wikidata~.+` 
 
 This document is autogenerated from [assets/layers/artwork/artwork.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/artwork/artwork.json)
\ No newline at end of file
diff --git a/Docs/Layers/barrier.md b/Docs/Layers/barrier.md
index c53fa4825..7c3501672 100644
--- a/Docs/Layers/barrier.md
+++ b/Docs/Layers/barrier.md
@@ -135,7 +135,7 @@ The question is  What kind of bollard is this?
   - Rising bollard  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bollard' target='_blank'>bollard</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bollard%3Drising' target='_blank'>rising</a>`
 
 
-Only visible if  `barrier=bollard`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `barrier=bollard`
 
 
 
@@ -155,7 +155,7 @@ The question is  What kind of cycling barrier is this?
   - Squeeze gate, gap is smaller at top, than at the bottom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycle_barrier' target='_blank'>cycle_barrier</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycle_barrier%3Dsqueeze' target='_blank'>squeeze</a>`
 
 
-Only visible if  `barrier=cycle_barrier`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `barrier=cycle_barrier`
 
 
 
@@ -185,7 +185,7 @@ This is rendered with  Space between barriers (along the length of the road): {w
 
 
 
-Only visible if  `cycle_barrier=double|cycle_barrier=triple`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier=double|cycle_barrier=triple`
 
 
 
@@ -201,7 +201,7 @@ This is rendered with  Width of opening: {width:opening} m
 
 
 
-Only visible if  `cycle_barrier=double|cycle_barrier=triple`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier=double|cycle_barrier=triple`
 
 
 
@@ -217,6 +217,6 @@ This is rendered with  Overlap: {overlap} m
 
 
 
-Only visible if  `cycle_barrier=double|cycle_barrier=triple`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier=double|cycle_barrier=triple` 
 
 This document is autogenerated from [assets/layers/barrier/barrier.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/barrier/barrier.json)
\ No newline at end of file
diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md
index 5047a8489..0081a6a97 100644
--- a/Docs/Layers/bicycle_rental.md
+++ b/Docs/Layers/bicycle_rental.md
@@ -107,7 +107,7 @@ The question is  What kind of bicycle rental is this?
   - This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bicycle_rental' target='_blank'>bicycle_rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bicycle_rental%3Ddropoff_point' target='_blank'>dropoff_point</a>`
 
 
-Only visible if  `amenity=bicycle_rental`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bicycle_rental`
 
 
 
@@ -183,7 +183,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `shop~.+|opening_hours~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+|opening_hours~.+`
 
 
 
@@ -203,7 +203,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+`
 
 
 
@@ -269,7 +269,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*city_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -287,7 +287,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*ebike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -305,7 +305,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^(.*kid_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -323,7 +323,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*bmx.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -341,7 +341,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^(.*mtb.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -359,7 +359,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -377,7 +377,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$`
 
 This tagrendering has labels  `bicycle_rental` 
 
diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md
index 6fdf9b60a..32293a3a7 100644
--- a/Docs/Layers/bicycle_rental_non_docking.md
+++ b/Docs/Layers/bicycle_rental_non_docking.md
@@ -106,7 +106,7 @@ The question is  What kind of bicycle rental is this?
   - This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bicycle_rental' target='_blank'>bicycle_rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bicycle_rental%3Ddropoff_point' target='_blank'>dropoff_point</a>`
 
 
-Only visible if  `amenity=bicycle_rental`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bicycle_rental`
 
 
 
@@ -182,7 +182,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `shop~.+|opening_hours~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+|opening_hours~.+`
 
 
 
@@ -202,7 +202,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+`
 
 
 
@@ -268,7 +268,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*city_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -286,7 +286,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*ebike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -304,7 +304,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^(.*kid_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -322,7 +322,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*bmx.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -340,7 +340,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^(.*mtb.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -358,7 +358,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -376,7 +376,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
diff --git a/Docs/Layers/bike_cleaning.md b/Docs/Layers/bike_cleaning.md
index 8f0624976..aeef93913 100644
--- a/Docs/Layers/bike_cleaning.md
+++ b/Docs/Layers/bike_cleaning.md
@@ -117,6 +117,6 @@ This is rendered with  Using the cleaning service costs {charge}
   - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `amenity=bike_wash|amenity=bicycle_wash`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bike_wash|amenity=bicycle_wash` 
 
 This document is autogenerated from [assets/layers/bike_cleaning/bike_cleaning.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bike_cleaning/bike_cleaning.json)
\ No newline at end of file
diff --git a/Docs/Layers/bike_parking.md b/Docs/Layers/bike_parking.md
index 566372593..4eedb31c4 100644
--- a/Docs/Layers/bike_parking.md
+++ b/Docs/Layers/bike_parking.md
@@ -209,6 +209,6 @@ This is rendered with  This parking fits {capacity:cargo_bike} cargo bikes
 
 
 
-Only visible if  `cargo_bike~^(designated|yes)$`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `cargo_bike~^(designated|yes)$` 
 
 This document is autogenerated from [assets/layers/bike_parking/bike_parking.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bike_parking/bike_parking.json)
\ No newline at end of file
diff --git a/Docs/Layers/bike_repair_station.md b/Docs/Layers/bike_repair_station.md
index 4cbe8cfa5..b7d09553e 100644
--- a/Docs/Layers/bike_repair_station.md
+++ b/Docs/Layers/bike_repair_station.md
@@ -120,7 +120,7 @@ The question is  Is the bike pump still operational?
   - The bike pump is operational  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump:operational_status' target='_blank'>service:bicycle:pump:operational_status</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump:operational_status%3Doperational' target='_blank'>operational</a>`
 
 
-Only visible if  `service:bicycle:pump=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:pump=yes`
 
 
 
@@ -226,7 +226,7 @@ The question is  Does this bike repair station have a special tool to repair you
   - There is no chain tool  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:chain_tool' target='_blank'>service:bicycle:chain_tool</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:chain_tool%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `service:bicycle:tools=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:tools=yes`
 
 
 
@@ -244,7 +244,7 @@ The question is  Does this bike station have a hook to hang your bike on or a st
   - There is no hook or stand  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:stand' target='_blank'>service:bicycle:stand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:stand%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `service:bicycle:tools=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:tools=yes`
 
 
 
@@ -256,7 +256,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `email~.+&service:bicycle:pump:operational_status=broken`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `email~.+&service:bicycle:pump:operational_status=broken`
 
 
 
@@ -295,7 +295,7 @@ The question is  Is this an electric bike pump?
   - Electrical pump  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:manual' target='_blank'>manual</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:manual%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `service:bicycle:pump=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:pump=yes`
 
 
 
@@ -314,7 +314,7 @@ The question is  Does the pump have a pressure indicator or manometer?
   - There is manometer but it is broken  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:manometer' target='_blank'>manometer</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:manometer%3Dbroken' target='_blank'>broken</a>`
 
 
-Only visible if  `service:bicycle:pump=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:pump=yes`
 
 
 
diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md
index a4555c466..349d10445 100644
--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
@@ -113,7 +113,7 @@ This tagrendering has no question and is thus read-only
   - This business focuses on rental  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental' target='_blank'>rental</a>`
 
 
-Only visible if  `shop~.+&shop!~^(bicycle)$&shop!~^(sports)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+&shop!~^(bicycle)$&shop!~^(sports)$`
 
 
 
@@ -309,7 +309,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*city_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -327,7 +327,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*ebike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -345,7 +345,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^(.*kid_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -363,7 +363,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*bmx.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -381,7 +381,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^(.*mtb.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -399,7 +399,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -417,7 +417,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md
index 961f9affd..9f1b1e914 100644
--- a/Docs/Layers/cafe_pub.md
+++ b/Docs/Layers/cafe_pub.md
@@ -348,7 +348,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -369,7 +369,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
diff --git a/Docs/Layers/caravansites.md b/Docs/Layers/caravansites.md
index b7f1e4056..920c3feea 100644
--- a/Docs/Layers/caravansites.md
+++ b/Docs/Layers/caravansites.md
@@ -131,7 +131,7 @@ This is rendered with  This place charges {charge}
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -197,7 +197,7 @@ The question is  Do you have to pay for the internet access?
   - You do not need to pay extra for internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `internet_access=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=yes`
 
 
 
diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md
index 1ff47b5e8..f1f5c3fc4 100644
--- a/Docs/Layers/charging_station.md
+++ b/Docs/Layers/charging_station.md
@@ -309,7 +309,7 @@ This is rendered with  There are <b class='text-xl'>{socket:schuko}</b> plugs of
 
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 
 
@@ -325,7 +325,7 @@ This is rendered with  There are <b class='text-xl'>{socket:typee}</b> plugs of
 
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 
 
@@ -341,7 +341,7 @@ This is rendered with  There are <b class='text-xl'>{socket:chademo}</b> plugs o
 
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 
 
@@ -357,7 +357,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_cable}</b> plu
 
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 
 
@@ -373,7 +373,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1}</b> plugs of
 
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 
 
@@ -389,7 +389,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_combo}</b> plu
 
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 
 
@@ -405,7 +405,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger}<
 
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 
 
@@ -421,7 +421,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2}</b> plugs of
 
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 
 
@@ -437,7 +437,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_combo}</b> plu
 
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 
 
@@ -453,7 +453,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_cable}</b> plu
 
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 
 
@@ -469,7 +469,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger_c
 
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 
 
@@ -485,7 +485,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -501,7 +501,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -517,7 +517,7 @@ This is rendered with  There are <b class='text-xl'>{socket:USB-A}</b> plugs of
 
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 
 
@@ -533,7 +533,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_3pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 
 
@@ -549,7 +549,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_5pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 
 
@@ -570,7 +570,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:voltage' target='_blank'>socket:schuko:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -593,7 +593,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:current' target='_blank'>socket:schuko:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -616,7 +616,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 3.6 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:output' target='_blank'>socket:schuko:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:output%3D3.6 kW' target='_blank'>3.6 kW</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -639,7 +639,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:voltage' target='_blank'>socket:typee:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -662,7 +662,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:current' target='_blank'>socket:typee:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -686,7 +686,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:output' target='_blank'>socket:typee:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -709,7 +709,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs 500 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:voltage' target='_blank'>socket:chademo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:voltage%3D500 V' target='_blank'>500 V</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -732,7 +732,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 120 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:current' target='_blank'>socket:chademo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:current%3D120 A' target='_blank'>120 A</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -755,7 +755,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:output' target='_blank'>socket:chademo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -779,7 +779,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:voltage' target='_blank'>socket:type1_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -802,7 +802,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:current' target='_blank'>socket:type1_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -826,7 +826,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 7 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:output' target='_blank'>socket:type1_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:output%3D7 kW' target='_blank'>7 kW</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -850,7 +850,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:voltage' target='_blank'>socket:type1:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -873,7 +873,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:current' target='_blank'>socket:type1:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -899,7 +899,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7.2 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:output' target='_blank'>socket:type1:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:output%3D7.2 kW' target='_blank'>7.2 kW</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -923,7 +923,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs 1000 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:voltage' target='_blank'>socket:type1_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:voltage%3D1000 V' target='_blank'>1000 V</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -947,7 +947,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 125 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:current' target='_blank'>socket:type1_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:current%3D125 A' target='_blank'>125 A</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -973,7 +973,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 350 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:output' target='_blank'>socket:type1_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:output%3D350 kW' target='_blank'>350 kW</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -996,7 +996,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:voltage' target='_blank'>socket:tesla_supercharger:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1020,7 +1020,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:current' target='_blank'>socket:tesla_supercharger:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1045,7 +1045,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:output' target='_blank'>socket:tesla_supercharger:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1069,7 +1069,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:voltage' target='_blank'>socket:type2:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1093,7 +1093,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:current' target='_blank'>socket:type2:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1117,7 +1117,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:output' target='_blank'>socket:type2:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1141,7 +1141,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:voltage' target='_blank'>socket:type2_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1165,7 +1165,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:current' target='_blank'>socket:type2_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1188,7 +1188,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:output' target='_blank'>socket:type2_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1212,7 +1212,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:voltage' target='_blank'>socket:type2_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1236,7 +1236,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:current' target='_blank'>socket:type2_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1260,7 +1260,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:output' target='_blank'>socket:type2_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1284,7 +1284,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:voltage' target='_blank'>socket:tesla_supercharger_ccs:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1308,7 +1308,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded type2_css) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:current' target='_blank'>socket:tesla_supercharger_ccs:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1331,7 +1331,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:output' target='_blank'>socket:tesla_supercharger_ccs:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1354,7 +1354,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1378,7 +1378,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1403,7 +1403,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1427,7 +1427,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1451,7 +1451,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1475,7 +1475,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1498,7 +1498,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs 5 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:voltage' target='_blank'>socket:USB-A:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:voltage%3D5 V' target='_blank'>5 V</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1522,7 +1522,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 2 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:current' target='_blank'>socket:USB-A:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:current%3D2 A' target='_blank'>2 A</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1546,7 +1546,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 10w A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:output' target='_blank'>socket:USB-A:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:output%3D10W' target='_blank'>10W</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1569,7 +1569,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1592,7 +1592,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1615,7 +1615,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1638,7 +1638,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1661,7 +1661,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1684,7 +1684,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1741,7 +1741,7 @@ This is rendered with  Using this charging station costs <b>{charge}</b>
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -1765,7 +1765,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:membership_card' target='_blank'>payment:membership_card</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:membership_card%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes|charge~.+`
 
 
 
@@ -1811,7 +1811,7 @@ This is rendered with  Authenticate by calling or SMS'ing to <a href='tel:{authe
 
 
 
-Only visible if  `authentication:phone_call=yes|authentication:short_message=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `authentication:phone_call=yes|authentication:short_message=yes`
 
 
 
@@ -1832,7 +1832,7 @@ This is rendered with  One can stay at most <b>{canonical(maxstay)}</b>
   - No timelimit on leaving your vehicle here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>`
 
 
-Only visible if  `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`
 
 
 
@@ -1961,7 +1961,7 @@ This is rendered with  Reference number is <b>{ref}</b>
 
 
 
-Only visible if  `network~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `network~.+`
 
 
 
diff --git a/Docs/Layers/charging_station_ebikes.md b/Docs/Layers/charging_station_ebikes.md
index e2cc0a5bc..28b0c919b 100644
--- a/Docs/Layers/charging_station_ebikes.md
+++ b/Docs/Layers/charging_station_ebikes.md
@@ -308,7 +308,7 @@ This is rendered with  There are <b class='text-xl'>{socket:schuko}</b> plugs of
 
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 
 
@@ -324,7 +324,7 @@ This is rendered with  There are <b class='text-xl'>{socket:typee}</b> plugs of
 
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 
 
@@ -340,7 +340,7 @@ This is rendered with  There are <b class='text-xl'>{socket:chademo}</b> plugs o
 
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 
 
@@ -356,7 +356,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_cable}</b> plu
 
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 
 
@@ -372,7 +372,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1}</b> plugs of
 
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 
 
@@ -388,7 +388,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_combo}</b> plu
 
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 
 
@@ -404,7 +404,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger}<
 
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 
 
@@ -420,7 +420,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2}</b> plugs of
 
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 
 
@@ -436,7 +436,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_combo}</b> plu
 
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 
 
@@ -452,7 +452,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_cable}</b> plu
 
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 
 
@@ -468,7 +468,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger_c
 
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 
 
@@ -484,7 +484,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -500,7 +500,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -516,7 +516,7 @@ This is rendered with  There are <b class='text-xl'>{socket:USB-A}</b> plugs of
 
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 
 
@@ -532,7 +532,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_3pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 
 
@@ -548,7 +548,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_5pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 
 
@@ -569,7 +569,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:voltage' target='_blank'>socket:schuko:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -592,7 +592,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:current' target='_blank'>socket:schuko:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -615,7 +615,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 3.6 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:output' target='_blank'>socket:schuko:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:output%3D3.6 kW' target='_blank'>3.6 kW</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -638,7 +638,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:voltage' target='_blank'>socket:typee:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -661,7 +661,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:current' target='_blank'>socket:typee:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -685,7 +685,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:output' target='_blank'>socket:typee:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -708,7 +708,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs 500 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:voltage' target='_blank'>socket:chademo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:voltage%3D500 V' target='_blank'>500 V</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -731,7 +731,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 120 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:current' target='_blank'>socket:chademo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:current%3D120 A' target='_blank'>120 A</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -754,7 +754,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:output' target='_blank'>socket:chademo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -778,7 +778,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:voltage' target='_blank'>socket:type1_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -801,7 +801,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:current' target='_blank'>socket:type1_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -825,7 +825,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 7 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:output' target='_blank'>socket:type1_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:output%3D7 kW' target='_blank'>7 kW</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -849,7 +849,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:voltage' target='_blank'>socket:type1:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -872,7 +872,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:current' target='_blank'>socket:type1:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -898,7 +898,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7.2 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:output' target='_blank'>socket:type1:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:output%3D7.2 kW' target='_blank'>7.2 kW</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -922,7 +922,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs 1000 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:voltage' target='_blank'>socket:type1_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:voltage%3D1000 V' target='_blank'>1000 V</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -946,7 +946,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 125 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:current' target='_blank'>socket:type1_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:current%3D125 A' target='_blank'>125 A</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -972,7 +972,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 350 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:output' target='_blank'>socket:type1_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:output%3D350 kW' target='_blank'>350 kW</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -995,7 +995,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:voltage' target='_blank'>socket:tesla_supercharger:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1019,7 +1019,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:current' target='_blank'>socket:tesla_supercharger:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1044,7 +1044,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:output' target='_blank'>socket:tesla_supercharger:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1068,7 +1068,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:voltage' target='_blank'>socket:type2:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1092,7 +1092,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:current' target='_blank'>socket:type2:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1116,7 +1116,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:output' target='_blank'>socket:type2:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1140,7 +1140,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:voltage' target='_blank'>socket:type2_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1164,7 +1164,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:current' target='_blank'>socket:type2_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1187,7 +1187,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:output' target='_blank'>socket:type2_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1211,7 +1211,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:voltage' target='_blank'>socket:type2_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1235,7 +1235,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:current' target='_blank'>socket:type2_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1259,7 +1259,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:output' target='_blank'>socket:type2_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1283,7 +1283,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:voltage' target='_blank'>socket:tesla_supercharger_ccs:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1307,7 +1307,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded type2_css) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:current' target='_blank'>socket:tesla_supercharger_ccs:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1330,7 +1330,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:output' target='_blank'>socket:tesla_supercharger_ccs:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1353,7 +1353,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1377,7 +1377,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1402,7 +1402,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1426,7 +1426,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1450,7 +1450,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1474,7 +1474,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1497,7 +1497,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs 5 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:voltage' target='_blank'>socket:USB-A:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:voltage%3D5 V' target='_blank'>5 V</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1521,7 +1521,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 2 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:current' target='_blank'>socket:USB-A:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:current%3D2 A' target='_blank'>2 A</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1545,7 +1545,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 10w A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:output' target='_blank'>socket:USB-A:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:output%3D10W' target='_blank'>10W</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1568,7 +1568,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1591,7 +1591,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1614,7 +1614,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1637,7 +1637,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1660,7 +1660,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1683,7 +1683,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1740,7 +1740,7 @@ This is rendered with  Using this charging station costs <b>{charge}</b>
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -1764,7 +1764,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:membership_card' target='_blank'>payment:membership_card</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:membership_card%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes|charge~.+`
 
 
 
@@ -1810,7 +1810,7 @@ This is rendered with  Authenticate by calling or SMS'ing to <a href='tel:{authe
 
 
 
-Only visible if  `authentication:phone_call=yes|authentication:short_message=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `authentication:phone_call=yes|authentication:short_message=yes`
 
 
 
@@ -1831,7 +1831,7 @@ This is rendered with  One can stay at most <b>{canonical(maxstay)}</b>
   - No timelimit on leaving your vehicle here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>`
 
 
-Only visible if  `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`
 
 
 
@@ -1960,7 +1960,7 @@ This is rendered with  Reference number is <b>{ref}</b>
 
 
 
-Only visible if  `network~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `network~.+`
 
 
 
diff --git a/Docs/Layers/climbing.md b/Docs/Layers/climbing.md
index 5395a8486..16d4239da 100644
--- a/Docs/Layers/climbing.md
+++ b/Docs/Layers/climbing.md
@@ -77,7 +77,7 @@ This is rendered with  <a href='{url}' target='_blank'>{url}</a>
 
 
 
-Only visible if  `leisure!~^(sports_centre)$&sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `leisure!~^(sports_centre)$&sport=climbing`
 
 
 
@@ -121,7 +121,7 @@ This is rendered with  The highest grade is {climbing:grade:french:max} accordin
 
 
 
-Only visible if  `climbing!~^(route)$&climbing:sport=yes|sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing!~^(route)$&climbing:sport=yes|sport=climbing`
 
 
 
diff --git a/Docs/Layers/climbing_area.md b/Docs/Layers/climbing_area.md
index 7703d3717..85a79e37c 100644
--- a/Docs/Layers/climbing_area.md
+++ b/Docs/Layers/climbing_area.md
@@ -125,7 +125,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_contained_climbing_routes~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_contained_climbing_routes~.+`
 
 
 
@@ -182,7 +182,7 @@ This is rendered with  The rock type is {rock}
   - Limestone  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:rock' target='_blank'>rock</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rock%3Dlimestone' target='_blank'>limestone</a>`
 
 
-Only visible if  `climbing=crag|natural=cliff|natural=bare_rock`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing=crag|natural=cliff|natural=bare_rock`
 
 
 
@@ -198,7 +198,7 @@ This is rendered with  <a href='{url}' target='_blank'>{url}</a>
 
 
 
-Only visible if  `leisure!~^(sports_centre)$&sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `leisure!~^(sports_centre)$&sport=climbing`
 
 
 
diff --git a/Docs/Layers/climbing_gym.md b/Docs/Layers/climbing_gym.md
index e7b96cf86..ee66fbf25 100644
--- a/Docs/Layers/climbing_gym.md
+++ b/Docs/Layers/climbing_gym.md
@@ -238,7 +238,7 @@ This is rendered with  The highest grade is {climbing:grade:french:max} accordin
 
 
 
-Only visible if  `climbing!~^(route)$&climbing:sport=yes|sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing!~^(route)$&climbing:sport=yes|sport=climbing`
 
 
 
@@ -291,7 +291,7 @@ This is rendered with  The sport climbing routes here have at most {climbing:bol
 
 
 
-Only visible if  `climbing:sport=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing:sport=yes`
 
 
 
diff --git a/Docs/Layers/climbing_opportunity.md b/Docs/Layers/climbing_opportunity.md
index aebe82767..fd5a6fa41 100644
--- a/Docs/Layers/climbing_opportunity.md
+++ b/Docs/Layers/climbing_opportunity.md
@@ -63,7 +63,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `name~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `name~.+`
 
 
 
diff --git a/Docs/Layers/crossings.md b/Docs/Layers/crossings.md
index d1e064ff4..2225a9e50 100644
--- a/Docs/Layers/crossings.md
+++ b/Docs/Layers/crossings.md
@@ -109,7 +109,7 @@ The question is  What kind of crossing is this?
   - Crossing without crossing markings  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dunmarked' target='_blank'>unmarked</a>`
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -127,7 +127,7 @@ The question is  Is this is a zebra crossing?
   - This is not a zebra crossing  corresponds with  ``
 
 
-Only visible if  `crossing=uncontrolled`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=uncontrolled`
 
 
 
@@ -145,7 +145,7 @@ The question is  Is this crossing also for bicycles?
   - A cyclist can not use this crossing  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bicycle' target='_blank'>bicycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bicycle%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -163,7 +163,7 @@ The question is  Does this crossing have an island in the middle?
   - This crossing does not have an island in the middle  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:crossing:island' target='_blank'>crossing:island</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:island%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -183,7 +183,7 @@ The question is  Does this crossing have tactile paving?
   - This option cannot be chosen as answer
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -201,7 +201,7 @@ The question is  Does this traffic light have a button to request green light?
   - This traffic light does not have a button to request green light  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:button_operated' target='_blank'>button_operated</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:button_operated%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=traffic_signals|crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=traffic_signals|crossing=traffic_signals`
 
 
 
@@ -221,7 +221,7 @@ The question is  Does this traffic light have sound signals to aid crossing?
   - This traffic light has a sound signal to sign that it is safe to cross, but no signal to help locate the pole.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:sound' target='_blank'>traffic_signals:sound</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:sound%3Dwalk' target='_blank'>walk</a>`
 
 
-Only visible if  `crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals`
 
 
 
@@ -239,7 +239,7 @@ The question is  Does this traffic light have vibration signals to aid crossing?
   - The button for this traffic light does not have a vibration signal to indicate that it is safe to cross.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:vibration' target='_blank'>traffic_signals:vibration</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:vibration%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `crossing=traffic_signals&button_operated=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals&button_operated=yes`
 
 
 
@@ -257,7 +257,7 @@ The question is  Does this traffic light have an arrow pointing in the direction
   - This traffic light does <b>not</b> have an arrow pointing in the direction of crossing.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:arrow' target='_blank'>traffic_signals:arrow</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:arrow%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals`
 
 
 
@@ -275,7 +275,7 @@ The question is  Does this traffic light have a tactile map showing the layout o
   - This traffic light does <b>not</b> have a tactile map showing the layout of the crossing.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:minimap' target='_blank'>traffic_signals:minimap</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:minimap%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals`
 
 
 
@@ -294,7 +294,7 @@ The question is  Can a cyclist turn right when the light is red?
   - A cyclist can not turn right if the light is red  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:red_turn:right:bicycle' target='_blank'>red_turn:right:bicycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:red_turn:right:bicycle%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=traffic_signals`
 
 
 
@@ -313,6 +313,6 @@ The question is  Can a cyclist go straight on when the light is red?
   - A cyclist can not go straight on if the light is red  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:red_turn:straight:bicycle' target='_blank'>red_turn:straight:bicycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:red_turn:straight:bicycle%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=traffic_signals`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `highway=traffic_signals` 
 
 This document is autogenerated from [assets/layers/crossings/crossings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/crossings/crossings.json)
\ No newline at end of file
diff --git a/Docs/Layers/cultural_places_without_etymology.md b/Docs/Layers/cultural_places_without_etymology.md
index 1a3cdab8d..bd62655e8 100644
--- a/Docs/Layers/cultural_places_without_etymology.md
+++ b/Docs/Layers/cultural_places_without_etymology.md
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/cycleways_and_roads.md b/Docs/Layers/cycleways_and_roads.md
index 0e384bbc6..c5dcb6781 100644
--- a/Docs/Layers/cycleways_and_roads.md
+++ b/Docs/Layers/cycleways_and_roads.md
@@ -197,7 +197,7 @@ This is rendered with  This cyleway is made of {cycleway:surface}
   - This cycleway is made from raw ground  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:surface' target='_blank'>cycleway:surface</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:surface%3Dground' target='_blank'>ground</a>`
 
 
-Only visible if  `cycleway=shared_lane|cycleway=lane|cycleway=track`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=shared_lane|cycleway=lane|cycleway=track`
 
 
 
@@ -221,7 +221,7 @@ The question is  What is the smoothness of this cycleway?
   - Impassable / No wheeled vehicle  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:smoothness' target='_blank'>cycleway:smoothness</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:smoothness%3Dimpassable' target='_blank'>impassable</a>`
 
 
-Only visible if  `cycleway=shared_lane|cycleway=lane|cycleway=track`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=shared_lane|cycleway=lane|cycleway=track`
 
 
 
@@ -279,7 +279,7 @@ The question is  What is the smoothness of this street?
   - Impassable / No wheeled vehicle  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:smoothness' target='_blank'>smoothness</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:smoothness%3Dimpassable' target='_blank'>impassable</a>`
 
 
-Only visible if  `cycleway=no|highway=cycleway`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=no|highway=cycleway`
 
 
 
@@ -315,7 +315,7 @@ The question is  What traffic sign does this cycleway have?
   - No traffic sign present  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign' target='_blank'>cycleway:traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign%3Dnone' target='_blank'>none</a>`
 
 
-Only visible if  `cycleway=lane|cycleway=track&_country=be`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=lane|cycleway=track&_country=be`
 
 
 
@@ -340,7 +340,7 @@ The question is  What traffic sign does this cycleway have?
   - No traffic sign present  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dnone' target='_blank'>none</a>`
 
 
-Only visible if  `highway=cycleway|highway=path&_country=be|_country=nl`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=cycleway|highway=path&_country=be|_country=nl`
 
 
 
@@ -363,7 +363,7 @@ The question is  Does the traffic sign D7 (<img src='./assets/layers/cycleways_a
   - No supplementary traffic sign present  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign:supplementary' target='_blank'>cycleway:traffic_sign:supplementary</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign:supplementary%3Dnone' target='_blank'>none</a>`
 
 
-Only visible if  `cycleway:traffic_sign=BE:D7|cycleway:traffic_sign~^(BE:D7;.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway:traffic_sign=BE:D7|cycleway:traffic_sign~^(BE:D7;.*)$`
 
 
 
@@ -379,7 +379,7 @@ This is rendered with  The buffer besides this cycleway is {cycleway:buffer} m
 
 
 
-Only visible if  `cycleway=track|cycleway=lane`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=track|cycleway=lane`
 
 
 
@@ -399,7 +399,7 @@ The question is  How is this cycleway separated from the road?
   - This cycleway is separated by a kerb  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:separation' target='_blank'>cycleway:separation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:separation%3Dkerb' target='_blank'>kerb</a>`
 
 
-Only visible if  `cycleway=track|cycleway=lane`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=track|cycleway=lane`
 
 
 
@@ -419,6 +419,6 @@ The question is  How is this cycleway separated from the road?
   - This cycleway is separated by a kerb  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:separation' target='_blank'>separation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:separation%3Dkerb' target='_blank'>kerb</a>`
 
 
-Only visible if  `highway=cycleway|highway=path`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `highway=cycleway|highway=path` 
 
 This document is autogenerated from [assets/layers/cycleways_and_roads/cycleways_and_roads.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/cycleways_and_roads/cycleways_and_roads.json)
\ No newline at end of file
diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md
index 1a99e1fa7..73bfe81fc 100644
--- a/Docs/Layers/defibrillator.md
+++ b/Docs/Layers/defibrillator.md
@@ -150,7 +150,7 @@ The question is  Is this a a regular automatic defibrillator or a manual defibri
   - This option cannot be chosen as answer
 
 
-Only visible if  `access=no`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=no`
 
 
 
@@ -172,7 +172,7 @@ This is rendered with  This defibrillator is on floor {level}
   - This defibrillator is on the <b>first floor</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D1' target='_blank'>1</a>`
 
 
-Only visible if  `indoor=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=yes`
 
 
 
diff --git a/Docs/Layers/dentist.md b/Docs/Layers/dentist.md
new file mode 100644
index 000000000..4ef8f80f0
--- /dev/null
+++ b/Docs/Layers/dentist.md
@@ -0,0 +1,170 @@
+
+
+ dentist 
+=========
+
+
+
+<img src='https://mapcomplete.osm.be/circle:white;./assets/layers/dentist/dentist.svg' height="100px"> 
+
+This layer shows dentist offices
+
+
+
+
+
+
+  - This layer is shown at zoomlevel **13** and higher
+
+
+
+
+#### Themes using this layer 
+
+
+
+
+
+  - [healthcare](https://mapcomplete.osm.be/healthcare)
+  - [personal](https://mapcomplete.osm.be/personal)
+
+
+
+
+ Basic tags for this layer 
+---------------------------
+
+
+
+Elements must have the all of following tags to be shown on this layer:
+
+
+
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Ddentist' target='_blank'>dentist</a>
+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22dentist%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+
+
+ Supported attributes 
+----------------------
+
+
+
+Warning: 
+
+this quick overview is incomplete
+
+
+
+attribute | type | values which are supported by this layer
+----------- | ------ | ------------------------------------------
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+
+
+
+
+### images 
+
+
+
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata`
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### opening_hours 
+
+
+
+The question is  What are the opening hours of {title()}?
+
+This rendering asks information about the property  [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) 
+
+This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)}
+
+
+
+
+
+### phone 
+
+
+
+The question is  What is the phone number of {title()}?
+
+This rendering asks information about the property  [phone](https://wiki.openstreetmap.org/wiki/Key:phone) 
+
+This is rendered with  <a href='tel:{phone}'>{phone}</a>
+
+
+
+
+
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### email 
+
+
+
+The question is  What is the email address of {title()}?
+
+This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
+
+This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
+
+
+
+
+
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### website 
+
+
+
+The question is  What is the website of {title()}?
+
+This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
+
+This is rendered with  <a href='{website}' target='_blank'>{website}</a>
+
+
+
+
+
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### name 
+
+
+
+The question is  What is the name of this dentist?
+
+This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
+
+This is rendered with  This dentist is called {name}
+
+ 
+
+This document is autogenerated from [assets/layers/dentist/dentist.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/dentist/dentist.json)
\ No newline at end of file
diff --git a/Docs/Layers/doctors.md b/Docs/Layers/doctors.md
index 003dccffb..ffb30081d 100644
--- a/Docs/Layers/doctors.md
+++ b/Docs/Layers/doctors.md
@@ -7,7 +7,7 @@
 
 <img src='https://mapcomplete.osm.be/circle:white;./assets/layers/doctors/doctors.svg' height="100px"> 
 
-This layer shows doctor offices, dentists and other healthcare facilities
+This layer shows doctor offices
 
 
 
@@ -41,10 +41,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Ddoctors' target='_blank'>doctors</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Ddentist' target='_blank'>dentist</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:healthcare' target='_blank'>healthcare</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:healthcare%3Dphysiotherapist' target='_blank'>physiotherapist</a>
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Ddoctors' target='_blank'>doctors</a>
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22doctors%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22dentist%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22healthcare%22%3D%22physiotherapist%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22doctors%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -61,11 +61,11 @@ this quick overview is incomplete
 
 attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | ["by appointment"](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment")
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/healthcare:speciality#values) [healthcare:speciality](https://wiki.openstreetmap.org/wiki/Key:healthcare:speciality) | [string](../SpecialInputElements.md#string) | [general](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dgeneral) [gynaecology](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dgynaecology) [psychiatry](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dpsychiatry) [paediatrics](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dpaediatrics)
 
 
@@ -83,7 +83,21 @@ This tagrendering has no question and is thus read-only
 
 
 
-### opening_hours 
+### name 
+
+
+
+The question is  What is the name of this doctors place?
+
+This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
+
+This is rendered with  This doctors place is called {name}
+
+
+
+
+
+### opening_hours_by_appointment 
 
 
 
@@ -97,6 +111,13 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
+  - Only by appointment  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:opening_hours' target='_blank'>opening_hours</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment"' target='_blank'>"by appointment"</a>`
+  - Only by appointment  corresponds with  `opening_hours~^("by appointment"|by appointment)$`
+  - This option cannot be chosen as answer
+
+
+
+
 ### phone 
 
 
@@ -157,20 +178,6 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-### name 
-
-
-
-The question is  What is the name of this doctors place?
-
-This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
-
-This is rendered with  This doctors place is called {name}
-
-
-
-
-
 ### specialty 
 
 
@@ -189,8 +196,6 @@ This is rendered with  This doctor is specialized in {healthcare:speciality}
   - This is a gynaecologist  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:healthcare:speciality' target='_blank'>healthcare:speciality</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dgynaecology' target='_blank'>gynaecology</a>`
   - This is a psychiatrist  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:healthcare:speciality' target='_blank'>healthcare:speciality</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dpsychiatry' target='_blank'>psychiatry</a>`
   - This is a paediatrician  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:healthcare:speciality' target='_blank'>healthcare:speciality</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dpaediatrics' target='_blank'>paediatrics</a>`
-
-
-Only visible if  `amenity=doctors`  is shown 
+ 
 
 This document is autogenerated from [assets/layers/doctors/doctors.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/doctors/doctors.json)
\ No newline at end of file
diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md
index 74b4df326..fc73cf62b 100644
--- a/Docs/Layers/dogfoodb.md
+++ b/Docs/Layers/dogfoodb.md
@@ -74,8 +74,10 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:halal#values) [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/friture:oil#values) [friture:oil](https://wiki.openstreetmap.org/wiki/Key:friture:oil) | Multiple choice | [vegetable](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Dvegetable) [animal](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/reusable_packaging:accept#values) [reusable_packaging:accept](https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno)
@@ -384,6 +386,23 @@ The question is  Does this restaurant offer a halal menu?
 
 
 
+### organic (no friture) 
+
+
+
+The question is  Does this restaurant offer organic food?
+
+
+
+
+
+  - There are no organic options available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - There is an organic menu  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - Only organic options are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+
+
 ### friture-vegetarian 
 
 
@@ -399,7 +418,7 @@ The question is  Does this fries shop have vegetarian snacks?
   - No vegetarian snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -418,7 +437,26 @@ The question is  Does this fries shop have vegan snacks?
   - No vegan snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
+
+
+
+### friture-organic 
+
+
+
+The question is  Does this fries shop offer organic snacks?
+
+
+
+
+
+  - Organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - No organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - Only organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -436,7 +474,7 @@ The question is  Does this fries shop use vegetable or animal oil for cooking?
   - The frying is done with animal oil  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:friture:oil' target='_blank'>friture:oil</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal' target='_blank'>animal</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -455,7 +493,7 @@ The question is  If you bring your own container (such as a cooking pot and smal
   - You <b>must</b> bring your own container to order here.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept' target='_blank'>reusable_packaging:accept</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly' target='_blank'>only</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -530,7 +568,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -551,7 +589,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md
index 14f324139..2bb98f517 100644
--- a/Docs/Layers/dogshop.md
+++ b/Docs/Layers/dogshop.md
@@ -70,6 +70,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno)
 
 
 
@@ -417,7 +418,7 @@ The question is  What paper formats does this shop offer?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`
 
 
 
@@ -456,7 +457,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -477,7 +478,26 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
+
+
+
+### organic 
+
+
+
+The question is  Does this shop offer organic products?
+
+
+
+
+
+  - This shop offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - This shop only offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+  - This shop does not offer organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist`
 
 
 
diff --git a/Docs/Layers/drinking_water.md b/Docs/Layers/drinking_water.md
index edb475c4f..041d080b1 100644
--- a/Docs/Layers/drinking_water.md
+++ b/Docs/Layers/drinking_water.md
@@ -130,6 +130,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_closest_other_drinking_water_id~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `_closest_other_drinking_water_id~.+` 
 
 This document is autogenerated from [assets/layers/drinking_water/drinking_water.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/drinking_water/drinking_water.json)
\ No newline at end of file
diff --git a/Docs/Layers/dumpstations.md b/Docs/Layers/dumpstations.md
index 5ce14853c..e1c895575 100644
--- a/Docs/Layers/dumpstations.md
+++ b/Docs/Layers/dumpstations.md
@@ -113,7 +113,7 @@ This is rendered with  This place charges {charge}
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
diff --git a/Docs/Layers/education_institutions_without_etymology.md b/Docs/Layers/education_institutions_without_etymology.md
index 9b913cdf6..2da44705f 100644
--- a/Docs/Layers/education_institutions_without_etymology.md
+++ b/Docs/Layers/education_institutions_without_etymology.md
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/etymology.md b/Docs/Layers/etymology.md
index b0f7a31e8..1dba0c95e 100644
--- a/Docs/Layers/etymology.md
+++ b/Docs/Layers/etymology.md
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/layers/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/fietsstraat.md b/Docs/Layers/fietsstraat.md
index 9a9cf7dec..8581c9cfd 100644
--- a/Docs/Layers/fietsstraat.md
+++ b/Docs/Layers/fietsstraat.md
@@ -116,7 +116,7 @@ The question is  What sign does this bicycle road have?
   - There are no supplementary signs at this bicycle road.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DDE:244.1' target='_blank'>DE:244.1</a>`
 
 
-Only visible if  `bicycle_road=yes&_country=de`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `bicycle_road=yes&_country=de`
 
 
 
@@ -132,7 +132,7 @@ This is rendered with  This street will become a cyclestreet at {cyclestreet:sta
 
 
 
-Only visible if  `proposed:cyclestreet=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `proposed:cyclestreet=yes`
 
 
 
diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md
index 72adb45c2..bfe13707c 100644
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@@ -77,8 +77,10 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:halal#values) [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/friture:oil#values) [friture:oil](https://wiki.openstreetmap.org/wiki/Key:friture:oil) | Multiple choice | [vegetable](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Dvegetable) [animal](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/reusable_packaging:accept#values) [reusable_packaging:accept](https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno)
@@ -387,6 +389,23 @@ The question is  Does this restaurant offer a halal menu?
 
 
 
+### organic (no friture) 
+
+
+
+The question is  Does this restaurant offer organic food?
+
+
+
+
+
+  - There are no organic options available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - There is an organic menu  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - Only organic options are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+
+
 ### friture-vegetarian 
 
 
@@ -402,7 +421,7 @@ The question is  Does this fries shop have vegetarian snacks?
   - No vegetarian snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -421,7 +440,26 @@ The question is  Does this fries shop have vegan snacks?
   - No vegan snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
+
+
+
+### friture-organic 
+
+
+
+The question is  Does this fries shop offer organic snacks?
+
+
+
+
+
+  - Organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - No organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - Only organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -439,7 +477,7 @@ The question is  Does this fries shop use vegetable or animal oil for cooking?
   - The frying is done with animal oil  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:friture:oil' target='_blank'>friture:oil</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal' target='_blank'>animal</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -458,7 +496,7 @@ The question is  If you bring your own container (such as a cooking pot and smal
   - You <b>must</b> bring your own container to order here.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept' target='_blank'>reusable_packaging:accept</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly' target='_blank'>only</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -533,7 +571,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -554,7 +592,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md
index a09baf9b0..31af592bb 100644
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@@ -74,8 +74,10 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:halal#values) [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/friture:oil#values) [friture:oil](https://wiki.openstreetmap.org/wiki/Key:friture:oil) | Multiple choice | [vegetable](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Dvegetable) [animal](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/reusable_packaging:accept#values) [reusable_packaging:accept](https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno)
@@ -384,6 +386,23 @@ The question is  Does this restaurant offer a halal menu?
 
 
 
+### organic (no friture) 
+
+
+
+The question is  Does this restaurant offer organic food?
+
+
+
+
+
+  - There are no organic options available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - There is an organic menu  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - Only organic options are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+
+
 ### friture-vegetarian 
 
 
@@ -399,7 +418,7 @@ The question is  Does this fries shop have vegetarian snacks?
   - No vegetarian snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -418,7 +437,26 @@ The question is  Does this fries shop have vegan snacks?
   - No vegan snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
+
+
+
+### friture-organic 
+
+
+
+The question is  Does this fries shop offer organic snacks?
+
+
+
+
+
+  - Organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - No organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - Only organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -436,7 +474,7 @@ The question is  Does this fries shop use vegetable or animal oil for cooking?
   - The frying is done with animal oil  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:friture:oil' target='_blank'>friture:oil</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal' target='_blank'>animal</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -455,7 +493,7 @@ The question is  If you bring your own container (such as a cooking pot and smal
   - You <b>must</b> bring your own container to order here.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept' target='_blank'>reusable_packaging:accept</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly' target='_blank'>only</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -530,7 +568,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -551,7 +589,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
diff --git a/Docs/Layers/health_and_social_places_without_etymology.md b/Docs/Layers/health_and_social_places_without_etymology.md
index f14913700..2c919d973 100644
--- a/Docs/Layers/health_and_social_places_without_etymology.md
+++ b/Docs/Layers/health_and_social_places_without_etymology.md
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/hotel.md b/Docs/Layers/hotel.md
index 760651bb2..fb79b4cfa 100644
--- a/Docs/Layers/hotel.md
+++ b/Docs/Layers/hotel.md
@@ -224,7 +224,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -245,6 +245,6 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan` 
 
 This document is autogenerated from [assets/layers/hotel/hotel.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/hotel/hotel.json)
\ No newline at end of file
diff --git a/Docs/Layers/indoors.md b/Docs/Layers/indoors.md
index a94e31700..e581844ff 100644
--- a/Docs/Layers/indoors.md
+++ b/Docs/Layers/indoors.md
@@ -92,7 +92,7 @@ This is rendered with  This room has the reference number {ref}
 
 
 
-Only visible if  `indoor=room|indoor=area|indoor=corridor`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=room|indoor=area|indoor=corridor`
 
 
 
@@ -108,6 +108,6 @@ This is rendered with  This room is named {name}
 
 
 
-Only visible if  `indoor=room|indoor=area|indoor=corridor`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `indoor=room|indoor=area|indoor=corridor` 
 
 This document is autogenerated from [assets/layers/indoors/indoors.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/indoors/indoors.json)
\ No newline at end of file
diff --git a/Docs/Layers/kerbs.md b/Docs/Layers/kerbs.md
index 17fa1cb95..41793414a 100644
--- a/Docs/Layers/kerbs.md
+++ b/Docs/Layers/kerbs.md
@@ -103,7 +103,7 @@ The question is  What is the height of this kerb?
   - This option cannot be chosen as answer
 
 
-Only visible if  `_geometry:type=Point`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_geometry:type=Point`
 
 
 
@@ -123,7 +123,7 @@ The question is  Is there tactile paving at this kerb?
   - This option cannot be chosen as answer
 
 
-Only visible if  `_geometry:type=Point`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_geometry:type=Point`
 
 
 
diff --git a/Docs/Layers/kindergarten_childcare.md b/Docs/Layers/kindergarten_childcare.md
index d924159cf..3a234719c 100644
--- a/Docs/Layers/kindergarten_childcare.md
+++ b/Docs/Layers/kindergarten_childcare.md
@@ -173,7 +173,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `amenity=childcare`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=childcare`
 
 
 
diff --git a/Docs/Layers/map.md b/Docs/Layers/map.md
index d8ee5906f..79a932777 100644
--- a/Docs/Layers/map.md
+++ b/Docs/Layers/map.md
@@ -116,6 +116,6 @@ The question is  Is the OpenStreetMap-attribution given?
   - This option cannot be chosen as answer
 
 
-Only visible if  `map_source~^((O|)pen(S|s)treet(M|m)ap)$|map_source=osm|map_source=OSM`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `map_source~^((O|)pen(S|s)treet(M|m)ap)$|map_source=osm|map_source=OSM` 
 
 This document is autogenerated from [assets/layers/map/map.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/map/map.json)
\ No newline at end of file
diff --git a/Docs/Layers/maproulette.md b/Docs/Layers/maproulette.md
index 028e4fb22..6f700e300 100644
--- a/Docs/Layers/maproulette.md
+++ b/Docs/Layers/maproulette.md
@@ -84,6 +84,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `blurb~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `blurb~.+` 
 
 This document is autogenerated from [assets/layers/maproulette/maproulette.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/maproulette/maproulette.json)
\ No newline at end of file
diff --git a/Docs/Layers/maproulette_challenge.md b/Docs/Layers/maproulette_challenge.md
index 2d0f413ef..1e42b54cd 100644
--- a/Docs/Layers/maproulette_challenge.md
+++ b/Docs/Layers/maproulette_challenge.md
@@ -107,6 +107,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `blurb~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `blurb~.+` 
 
 This document is autogenerated from [assets/layers/maproulette_challenge/maproulette_challenge.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/maproulette_challenge/maproulette_challenge.json)
\ No newline at end of file
diff --git a/Docs/Layers/nature_reserve.md b/Docs/Layers/nature_reserve.md
index 69dd7615f..95df4c410 100644
--- a/Docs/Layers/nature_reserve.md
+++ b/Docs/Layers/nature_reserve.md
@@ -167,7 +167,7 @@ The question is  Are dogs allowed in this nature reserve?
   - Dogs are allowed to roam freely  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:dog' target='_blank'>dog</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `access=yes|access=permissive|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=permissive|access=guided`
 
 
 
diff --git a/Docs/Layers/observation_tower.md b/Docs/Layers/observation_tower.md
index e4f3b2ba8..59cfcd679 100644
--- a/Docs/Layers/observation_tower.md
+++ b/Docs/Layers/observation_tower.md
@@ -152,7 +152,7 @@ This is rendered with  Visiting this tower costs <b>{charge}</b>
   - Free to visit  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=guided`
 
 
 
@@ -172,7 +172,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes|charge~.+`
 
 
 
@@ -208,7 +208,7 @@ This is rendered with  This tower has {step_count} steps to reach the top
 
 
 
-Only visible if  `access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=guided`
 
 
 
@@ -226,7 +226,7 @@ The question is  Does this tower have an elevator?
   - This tower does not have an elevator  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:elevator' target='_blank'>elevator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:elevator%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=guided`
 
 
 
@@ -260,7 +260,7 @@ The question is  Is this place accessible with a wheelchair?
   - This place is not reachable with a wheelchair  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:wheelchair' target='_blank'>wheelchair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `elevator=yes&access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `elevator=yes&access=yes|access=guided`
 
 
 
diff --git a/Docs/Layers/osm_community_index.md b/Docs/Layers/osm_community_index.md
index ad0e59ac8..fc506d428 100644
--- a/Docs/Layers/osm_community_index.md
+++ b/Docs/Layers/osm_community_index.md
@@ -65,7 +65,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `level=country`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `level=country`
 
 
 
@@ -79,6 +79,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_community_links~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `_community_links~.+` 
 
 This document is autogenerated from [assets/layers/osm_community_index/osm_community_index.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/osm_community_index/osm_community_index.json)
\ No newline at end of file
diff --git a/Docs/Layers/parcel_lockers.md b/Docs/Layers/parcel_lockers.md
index 2aeda32ae..7e0b14a98 100644
--- a/Docs/Layers/parcel_lockers.md
+++ b/Docs/Layers/parcel_lockers.md
@@ -165,7 +165,7 @@ The question is  Can you send packages from this parcel locker?
   - You <b>can't</b> send packages from this parcel locker  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:parcel_mail_in' target='_blank'>parcel_mail_in</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:parcel_mail_in%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `amenity=parcel_locker`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=parcel_locker`
 
 
 
@@ -183,6 +183,6 @@ The question is  Can you pick up packages from this parcel locker?
   - You <b>can't</b> pick up packages from this parcel locker  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:parcel_pickup' target='_blank'>parcel_pickup</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:parcel_pickup%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `amenity=parcel_locker`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `amenity=parcel_locker` 
 
 This document is autogenerated from [assets/layers/parcel_lockers/parcel_lockers.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/parcel_lockers/parcel_lockers.json)
\ No newline at end of file
diff --git a/Docs/Layers/parks_and_forests_without_etymology.md b/Docs/Layers/parks_and_forests_without_etymology.md
index ddb930fd0..4e5d8f7d4 100644
--- a/Docs/Layers/parks_and_forests_without_etymology.md
+++ b/Docs/Layers/parks_and_forests_without_etymology.md
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/physiotherapist.md b/Docs/Layers/physiotherapist.md
new file mode 100644
index 000000000..ae961f216
--- /dev/null
+++ b/Docs/Layers/physiotherapist.md
@@ -0,0 +1,177 @@
+
+
+ physiotherapist 
+=================
+
+
+
+<img src='https://mapcomplete.osm.be/circle:white;./assets/layers/physiotherapist/doctors.svg' height="100px"> 
+
+This layer shows physiotherapists
+
+
+
+
+
+
+  - This layer is shown at zoomlevel **13** and higher
+
+
+
+
+#### Themes using this layer 
+
+
+
+
+
+  - [healthcare](https://mapcomplete.osm.be/healthcare)
+  - [personal](https://mapcomplete.osm.be/personal)
+
+
+
+
+ Basic tags for this layer 
+---------------------------
+
+
+
+Elements must have the all of following tags to be shown on this layer:
+
+
+
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:healthcare' target='_blank'>healthcare</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:healthcare%3Dphysiotherapist' target='_blank'>physiotherapist</a>
+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22healthcare%22%3D%22physiotherapist%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+
+
+ Supported attributes 
+----------------------
+
+
+
+Warning: 
+
+this quick overview is incomplete
+
+
+
+attribute | type | values which are supported by this layer
+----------- | ------ | ------------------------------------------
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | ["by appointment"](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment")
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
+
+
+
+
+### images 
+
+
+
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata`
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### name 
+
+
+
+The question is  What is the name of this physiotherapists office?
+
+This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
+
+This is rendered with  This physiotherapists office is called {name}
+
+
+
+
+
+### opening_hours_by_appointment 
+
+
+
+The question is  What are the opening hours of {title()}?
+
+This rendering asks information about the property  [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) 
+
+This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)}
+
+
+
+
+
+  - Only by appointment  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:opening_hours' target='_blank'>opening_hours</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment"' target='_blank'>"by appointment"</a>`
+  - Only by appointment  corresponds with  `opening_hours~^("by appointment"|by appointment)$`
+  - This option cannot be chosen as answer
+
+
+
+
+### phone 
+
+
+
+The question is  What is the phone number of {title()}?
+
+This rendering asks information about the property  [phone](https://wiki.openstreetmap.org/wiki/Key:phone) 
+
+This is rendered with  <a href='tel:{phone}'>{phone}</a>
+
+
+
+
+
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### email 
+
+
+
+The question is  What is the email address of {title()}?
+
+This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
+
+This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
+
+
+
+
+
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### website 
+
+
+
+The question is  What is the website of {title()}?
+
+This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
+
+This is rendered with  <a href='{website}' target='_blank'>{website}</a>
+
+
+
+
+
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
+  - This option cannot be chosen as answer
+ 
+
+This document is autogenerated from [assets/layers/physiotherapist/physiotherapist.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/physiotherapist/physiotherapist.json)
\ No newline at end of file
diff --git a/Docs/Layers/postoffices.md b/Docs/Layers/postoffices.md
index 60451863a..4970388d0 100644
--- a/Docs/Layers/postoffices.md
+++ b/Docs/Layers/postoffices.md
@@ -122,7 +122,7 @@ The question is  Is this a post partner?
   - This shop is not a post partner  corresponds with  ``
 
 
-Only visible if  `post_office=post_partner`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `post_office=post_partner`
 
 
 
@@ -150,7 +150,7 @@ This is rendered with  This location offers services for {post_office:brand}
   - This location offers services for bpost  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:post_office:brand' target='_blank'>post_office:brand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:post_office:brand%3Dbpost' target='_blank'>bpost</a>`
 
 
-Only visible if  `post_office=post_partner`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `post_office=post_partner`
 
 
 
diff --git a/Docs/Layers/public_bookcase.md b/Docs/Layers/public_bookcase.md
index 3abff0fe6..8a8e83583 100644
--- a/Docs/Layers/public_bookcase.md
+++ b/Docs/Layers/public_bookcase.md
@@ -171,7 +171,7 @@ The question is  Is this public bookcase freely accessible?
   - Only accessible to customers  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `indoor=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=yes`
 
 
 
@@ -226,7 +226,7 @@ This is rendered with  The reference number of this public bookcase within {bran
   - This bookcase is not part of a bigger network  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:nobrand' target='_blank'>nobrand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:nobrand%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `brand~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `brand~.+`
 
 
 
diff --git a/Docs/Layers/rainbow_crossing_high_zoom.md b/Docs/Layers/rainbow_crossing_high_zoom.md
index 8de253429..d1e9b86b0 100644
--- a/Docs/Layers/rainbow_crossing_high_zoom.md
+++ b/Docs/Layers/rainbow_crossing_high_zoom.md
@@ -83,7 +83,7 @@ The question is  Does this crossing has rainbow paintings?
   - This option cannot be chosen as answer
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
diff --git a/Docs/Layers/rainbow_crossings.md b/Docs/Layers/rainbow_crossings.md
index ee309ee94..a18c9429b 100644
--- a/Docs/Layers/rainbow_crossings.md
+++ b/Docs/Layers/rainbow_crossings.md
@@ -83,6 +83,6 @@ The question is  Does this crossing has rainbow paintings?
   - This option cannot be chosen as answer
 
 
-Only visible if  `highway=crossing`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing` 
 
 This document is autogenerated from [assets/layers/rainbow_crossings/rainbow_crossings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/rainbow_crossings/rainbow_crossings.json)
\ No newline at end of file
diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md
index 6722a51c3..6b0942bef 100644
--- a/Docs/Layers/recycling.md
+++ b/Docs/Layers/recycling.md
@@ -117,7 +117,7 @@ This is rendered with  This recycling centre is named <b>{name}</b>
   - This recycling centre doesn't have a specific name  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:noname' target='_blank'>noname</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:noname%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
@@ -136,7 +136,7 @@ The question is  Where is this container located?
   - This container is located outdoors  corresponds with  ``
 
 
-Only visible if  `recycling_type=container`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=container`
 
 
 
@@ -230,7 +230,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
   - This option cannot be chosen as answer
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
@@ -252,7 +252,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
   - This option cannot be chosen as answer
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
@@ -274,7 +274,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
   - This option cannot be chosen as answer
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
diff --git a/Docs/Layers/school.md b/Docs/Layers/school.md
index 9e6ce2486..1f40bd5a2 100644
--- a/Docs/Layers/school.md
+++ b/Docs/Layers/school.md
@@ -121,7 +121,7 @@ The question is  What level of education is given on this school?
   - This school offers post-secondary education (e.g. a seventh or eight specialisation year)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:school' target='_blank'>school</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school%3Dpost_secondary' target='_blank'>post_secondary</a>`
 
 
-Only visible if  `_country=be`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
 
 
 
@@ -169,7 +169,7 @@ This is rendered with  This school has facilities for students with {school:for}
   - This is a school for students with special needs  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:school:for' target='_blank'>school:for</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dspecial_needs' target='_blank'>special_needs</a>`
 
 
-Only visible if  `school:for~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `school:for~.+`
 
 
 
diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md
index c7b4162bf..0f87e31ca 100644
--- a/Docs/Layers/shops.md
+++ b/Docs/Layers/shops.md
@@ -29,7 +29,6 @@ A shop
   - [personal](https://mapcomplete.osm.be/personal)
   - [pets](https://mapcomplete.osm.be/pets)
   - [shops](https://mapcomplete.osm.be/shops)
-  - [sports](https://mapcomplete.osm.be/sports)
 
 
 
@@ -73,6 +72,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno)
 
 
 
@@ -420,7 +420,7 @@ The question is  What paper formats does this shop offer?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`
 
 
 
@@ -459,7 +459,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -480,7 +480,26 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
+
+
+
+### organic 
+
+
+
+The question is  Does this shop offer organic products?
+
+
+
+
+
+  - This shop offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - This shop only offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+  - This shop does not offer organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist`
 
 
 
diff --git a/Docs/Layers/speed_camera.md b/Docs/Layers/speed_camera.md
index f9d40f506..adefafdcb 100644
--- a/Docs/Layers/speed_camera.md
+++ b/Docs/Layers/speed_camera.md
@@ -88,6 +88,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `ref~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `ref~.+` 
 
 This document is autogenerated from [assets/layers/speed_camera/speed_camera.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/speed_camera/speed_camera.json)
\ No newline at end of file
diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md
index cb4ff866c..3407490fb 100644
--- a/Docs/Layers/sport_pitch.md
+++ b/Docs/Layers/sport_pitch.md
@@ -217,7 +217,7 @@ This is rendered with  Openingsuren: {opening_hours_table()}
   - Always accessible  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:opening_hours' target='_blank'>opening_hours</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7' target='_blank'>24/7</a>`
 
 
-Only visible if  `access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access~.+`
 
 
 
diff --git a/Docs/Layers/sport_places_without_etymology.md b/Docs/Layers/sport_places_without_etymology.md
index 8aee3170c..8664a70eb 100644
--- a/Docs/Layers/sport_places_without_etymology.md
+++ b/Docs/Layers/sport_places_without_etymology.md
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md
new file mode 100644
index 000000000..387988ec2
--- /dev/null
+++ b/Docs/Layers/sport_shops.md
@@ -0,0 +1,547 @@
+
+
+ sport_shops 
+=============
+
+
+
+<img src='https://mapcomplete.osm.be/./assets/layers/id_presets/maki-shop.svg' height="100px"> 
+
+A shop
+
+
+
+
+
+
+  - This layer is shown at zoomlevel **12** and higher
+
+
+
+
+#### Themes using this layer 
+
+
+
+
+
+  - [sports](https://mapcomplete.osm.be/sports)
+
+
+
+
+ Basic tags for this layer 
+---------------------------
+
+
+
+Elements must have the all of following tags to be shown on this layer:
+
+
+
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports' target='_blank'>sports</a>
+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+
+
+ Supported attributes 
+----------------------
+
+
+
+Warning: 
+
+this quick overview is incomplete
+
+
+
+attribute | type | values which are supported by this layer
+----------- | ------ | ------------------------------------------
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [hobby](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno)
+
+
+
+
+### images 
+
+
+
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata`
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### shops-name 
+
+
+
+The question is  What is the name of this shop?
+
+This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
+
+This is rendered with  This shop is called <i>{name}</i>
+
+
+
+
+
+### shop_types 
+
+
+
+The question is  What kind of shop is this?
+
+This rendering asks information about the property  [shop](https://wiki.openstreetmap.org/wiki/Key:shop) 
+
+This is rendered with  This is a {shop}
+
+
+
+
+
+  - Farm Supply Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian' target='_blank'>agrarian</a>`
+  - Liquor Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol' target='_blank'>alcohol</a>`
+  - Anime / Manga Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime' target='_blank'>anime</a>`
+  - Antiques Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques' target='_blank'>antiques</a>`
+  - Appliance Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance' target='_blank'>appliance</a>`
+  - Art Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart' target='_blank'>art</a>`
+  - Baby Goods Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods' target='_blank'>baby_goods</a>`
+  - Bag/Luggage Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag' target='_blank'>bag</a>`
+  - Bakery  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery' target='_blank'>bakery</a>`
+  - Bathroom Furnishing Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing' target='_blank'>bathroom_furnishing</a>`
+  - Beauty Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty' target='_blank'>beauty</a>`
+  - Bedding/Mattress Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed' target='_blank'>bed</a>`
+  - Beverage Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages' target='_blank'>beverages</a>`
+  - Bicycle Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle' target='_blank'>bicycle</a>`
+  - Boat Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat' target='_blank'>boat</a>`
+  - Bookmaker  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker' target='_blank'>bookmaker</a>`
+  - Book Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks' target='_blank'>books</a>`
+  - Brewing Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies' target='_blank'>brewing_supplies</a>`
+  - Butcher  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher' target='_blank'>butcher</a>`
+  - Camera Equipment Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera' target='_blank'>camera</a>`
+  - Candle Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles' target='_blank'>candles</a>`
+  - Cannabis Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis' target='_blank'>cannabis</a>`
+  - Car Dealership  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar' target='_blank'>car</a>`
+  - Car Parts Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts' target='_blank'>car_parts</a>`
+  - Car Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair' target='_blank'>car_repair</a>`
+  - RV Dealership  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan' target='_blank'>caravan</a>`
+  - Carpet Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet' target='_blank'>carpet</a>`
+  - Catalog Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue' target='_blank'>catalogue</a>`
+  - Charity Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity' target='_blank'>charity</a>`
+  - Cheese Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese' target='_blank'>cheese</a>`
+  - Drugstore  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist' target='_blank'>chemist</a>`
+  - Chocolate Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate' target='_blank'>chocolate</a>`
+  - Clothing Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes' target='_blank'>clothes</a>`
+  - Coffee Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee' target='_blank'>coffee</a>`
+  - Collectibles Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector' target='_blank'>collector</a>`
+  - Computer Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer' target='_blank'>computer</a>`
+  - Candy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery' target='_blank'>confectionery</a>`
+  - Convenience Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience' target='_blank'>convenience</a>`
+  - Copy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop' target='_blank'>copyshop</a>`
+  - Cosmetics Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics' target='_blank'>cosmetics</a>`
+  - Country Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store' target='_blank'>country_store</a>`
+  - Arts & Crafts Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft' target='_blank'>craft</a>`
+  - Curtain Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain' target='_blank'>curtain</a>`
+  - Dairy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy' target='_blank'>dairy</a>`
+  - Deli  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli' target='_blank'>deli</a>`
+  - Department Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store' target='_blank'>department_store</a>`
+  - DIY Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself' target='_blank'>doityourself</a>`
+  - Door Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors' target='_blank'>doors</a>`
+  - Dry Cleaner  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning' target='_blank'>dry_cleaning</a>`
+  - E-Cigarette Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette' target='_blank'>e-cigarette</a>`
+  - Electrical Equipment Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical' target='_blank'>electrical</a>`
+  - Electronics Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics' target='_blank'>electronics</a>`
+  - Erotic Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic' target='_blank'>erotic</a>`
+  - Fabric Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric' target='_blank'>fabric</a>`
+  - Produce Stand  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm' target='_blank'>farm</a>`
+  - Fashion Accessories Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories' target='_blank'>fashion_accessories</a>`
+  - Fireplace Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace' target='_blank'>fireplace</a>`
+  - Fishing Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing' target='_blank'>fishing</a>`
+  - Flooring Supply Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring' target='_blank'>flooring</a>`
+  - Florist  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist' target='_blank'>florist</a>`
+  - Framing Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe' target='_blank'>frame</a>`
+  - Frozen Food Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food' target='_blank'>frozen_food</a>`
+  - Fuel Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel' target='_blank'>fuel</a>`
+  - Funeral Home  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors' target='_blank'>funeral_directors</a>`
+  - Furniture Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture' target='_blank'>furniture</a>`
+  - Tabletop Game Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames' target='_blank'>games</a>`
+  - Garden Center  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre' target='_blank'>garden_centre</a>`
+  - Bottled Gas Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas' target='_blank'>gas</a>`
+  - General Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral' target='_blank'>general</a>`
+  - Gift Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift' target='_blank'>gift</a>`
+  - Greengrocer  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer' target='_blank'>greengrocer</a>`
+  - Hairdresser  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser' target='_blank'>hairdresser</a>`
+  - Hairdresser Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply' target='_blank'>hairdresser_supply</a>`
+  - Hardware Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware' target='_blank'>hardware</a>`
+  - Health Food Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food' target='_blank'>health_food</a>`
+  - Hearing Aids Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids' target='_blank'>hearing_aids</a>`
+  - Herbalist  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist' target='_blank'>herbalist</a>`
+  - Hifi Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi' target='_blank'>hifi</a>`
+  - Hobby Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby' target='_blank'>hobby</a>`
+  - Household Linen Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen' target='_blank'>household_linen</a>`
+  - Houseware Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware' target='_blank'>houseware</a>`
+  - Hunting Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting' target='_blank'>hunting</a>`
+  - Interior Decoration Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration' target='_blank'>interior_decoration</a>`
+  - Jewelry Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry' target='_blank'>jewelry</a>`
+  - Kiosk  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk' target='_blank'>kiosk</a>`
+  - Kitchen Design Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen' target='_blank'>kitchen</a>`
+  - Laundry  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry' target='_blank'>laundry</a>`
+  - Leather Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather' target='_blank'>leather</a>`
+  - Lighting Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting' target='_blank'>lighting</a>`
+  - Locksmith  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith' target='_blank'>locksmith</a>`
+  - Lottery Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery' target='_blank'>lottery</a>`
+  - Mall  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall' target='_blank'>mall</a>`
+  - Massage Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage' target='_blank'>massage</a>`
+  - Medical Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply' target='_blank'>medical_supply</a>`
+  - Military Surplus Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus' target='_blank'>military_surplus</a>`
+  - Mobile Phone Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone' target='_blank'>mobile_phone</a>`
+  - Model Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel' target='_blank'>model</a>`
+  - Money Lender  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender' target='_blank'>money_lender</a>`
+  - Motorcycle Dealership  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle' target='_blank'>motorcycle</a>`
+  - Motorcycle Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair' target='_blank'>motorcycle_repair</a>`
+  - Music Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic' target='_blank'>music</a>`
+  - Musical Instrument Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument' target='_blank'>musical_instrument</a>`
+  - Newspaper/Magazine Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent' target='_blank'>newsagent</a>`
+  - Nutrition Supplements Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements' target='_blank'>nutrition_supplements</a>`
+  - Optician  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician' target='_blank'>optician</a>`
+  - Outdoors Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor' target='_blank'>outdoor</a>`
+  - Online Retailer Outpost  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost' target='_blank'>outpost</a>`
+  - Paint Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint' target='_blank'>paint</a>`
+  - Party Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty' target='_blank'>party</a>`
+  - Pastry Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry' target='_blank'>pastry</a>`
+  - Pawn Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker' target='_blank'>pawnbroker</a>`
+  - Perfume Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery' target='_blank'>perfumery</a>`
+  - Pet Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet' target='_blank'>pet</a>`
+  - Pet Grooming Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming' target='_blank'>pet_grooming</a>`
+  - Photography Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto' target='_blank'>photo</a>`
+  - Pottery Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery' target='_blank'>pottery</a>`
+  - Printer Ink Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink' target='_blank'>printer_ink</a>`
+  - Psychic  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic' target='_blank'>psychic</a>`
+  - Fireworks Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics' target='_blank'>pyrotechnics</a>`
+  - Radio/Electronic Component Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics' target='_blank'>radiotechnics</a>`
+  - Religious Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion' target='_blank'>religion</a>`
+  - Rental Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental' target='_blank'>rental</a>`
+  - Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair' target='_blank'>repair</a>`
+  - Scuba Diving Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving' target='_blank'>scuba_diving</a>`
+  - Seafood Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood' target='_blank'>seafood</a>`
+  - Consignment/Thrift Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand' target='_blank'>second_hand</a>`
+  - Sewing Supply Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing' target='_blank'>sewing</a>`
+  - Shoe Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair' target='_blank'>shoe_repair</a>`
+  - Shoe Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes' target='_blank'>shoes</a>`
+  - Spice Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices' target='_blank'>spices</a>`
+  - Sporting Goods Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports' target='_blank'>sports</a>`
+  - Stationery Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery' target='_blank'>stationery</a>`
+  - Storage Rental  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental' target='_blank'>storage_rental</a>`
+  - Supermarket  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket' target='_blank'>supermarket</a>`
+  - Pool Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool' target='_blank'>swimming_pool</a>`
+  - Tailor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor' target='_blank'>tailor</a>`
+  - Tattoo Parlor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo' target='_blank'>tattoo</a>`
+  - Tea Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea' target='_blank'>tea</a>`
+  - Telecom Retail Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication' target='_blank'>telecommunication</a>`
+  - Ticket Seller  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket' target='_blank'>ticket</a>`
+  - Tile Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles' target='_blank'>tiles</a>`
+  - Tobacco Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco' target='_blank'>tobacco</a>`
+  - Tool Rental  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire' target='_blank'>tool_hire</a>`
+  - Toy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys' target='_blank'>toys</a>`
+  - Trade Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade' target='_blank'>trade</a>`
+  - Travel Agency  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency' target='_blank'>travel_agency</a>`
+  - Trophy Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy' target='_blank'>trophy</a>`
+  - Tire Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres' target='_blank'>tyres</a>`
+  - Vacuum Cleaner Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner' target='_blank'>vacuum_cleaner</a>`
+  - Variety Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store' target='_blank'>variety_store</a>`
+  - Video Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo' target='_blank'>video</a>`
+  - Video Game Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games' target='_blank'>video_games</a>`
+  - Watches Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches' target='_blank'>watches</a>`
+  - Drinking Water Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater' target='_blank'>water</a>`
+  - Watersport/Swim Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports' target='_blank'>water_sports</a>`
+  - Weapon Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons' target='_blank'>weapons</a>`
+  - Wholesale Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale' target='_blank'>wholesale</a>`
+  - Wig Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs' target='_blank'>wigs</a>`
+  - Window Blind Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>`
+  - Wine Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>`
+
+
+
+
+### opening_hours 
+
+
+
+The question is  What are the opening hours of {title()}?
+
+This rendering asks information about the property  [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) 
+
+This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)}
+
+
+
+
+
+### website 
+
+
+
+The question is  What is the website of {title()}?
+
+This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
+
+This is rendered with  <a href='{website}' target='_blank'>{website}</a>
+
+
+
+
+
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### email 
+
+
+
+The question is  What is the email address of {title()}?
+
+This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
+
+This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
+
+
+
+
+
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### phone 
+
+
+
+The question is  What is the phone number of {title()}?
+
+This rendering asks information about the property  [phone](https://wiki.openstreetmap.org/wiki/Key:phone) 
+
+This is rendered with  <a href='tel:{phone}'>{phone}</a>
+
+
+
+
+
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### payment-options 
+
+
+
+The question is  Which methods of payment are accepted here?
+
+
+
+
+
+  - Cash is accepted here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:payment:cash' target='_blank'>payment:cash</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cash%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cash' target='_blank'>payment:cash</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cash%3Dno' target='_blank'>no</a>
+  - Payment cards are accepted here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
+
+
+
+
+### level 
+
+
+
+The question is  On what level is this feature located?
+
+This rendering asks information about the property  [level](https://wiki.openstreetmap.org/wiki/Key:level) 
+
+This is rendered with  Located on the {level}th floor
+
+
+
+
+
+  - Located underground  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:location' target='_blank'>location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:location%3Dunderground' target='_blank'>underground</a>`
+  - This option cannot be chosen as answer
+  - Located on the ground floor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D0' target='_blank'>0</a>`
+  - Located on the ground floor  corresponds with  ``
+  - This option cannot be chosen as answer
+  - Located on the first floor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D1' target='_blank'>1</a>`
+  - Located on the first basement level  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D-1' target='_blank'>-1</a>`
+
+
+
+
+### copyshop-print-sizes 
+
+
+
+The question is  What paper formats does this shop offer?
+
+
+
+
+
+  - This shop can print on papers of size A4  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A4' target='_blank'>service:print:A4</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A4%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A4' target='_blank'>service:print:A4</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A4%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A3  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A3' target='_blank'>service:print:A3</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A3%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A3' target='_blank'>service:print:A3</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A3%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A2  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A2' target='_blank'>service:print:A2</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A2%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A2' target='_blank'>service:print:A2</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A2%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A1  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A1' target='_blank'>service:print:A1</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A1%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A1' target='_blank'>service:print:A1</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A1%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A0  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`
+
+
+
+### internet 
+
+
+
+The question is  Does this place offer internet access?
+
+
+
+
+
+  - This place offers wireless internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan' target='_blank'>wlan</a>`
+  - This place <b>does not</b> offer internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno' target='_blank'>no</a>`
+  - This place offers internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dyes' target='_blank'>yes</a>`
+  - This option cannot be chosen as answer
+  - This place offers internet access via a terminal or computer  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal' target='_blank'>terminal</a>`
+  - This place offers wired internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired' target='_blank'>wired</a>`
+
+
+
+
+### internet-fee 
+
+
+
+The question is  Is there a fee for internet access?
+
+
+
+
+
+  - There is a fee for the internet access at this place  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes' target='_blank'>yes</a>`
+  - Internet access is free at this place  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno' target='_blank'>no</a>`
+  - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
+
+
+
+### internet-ssid 
+
+
+
+The question is  What is the network name for the wireless internet access?
+
+This rendering asks information about the property  [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) 
+
+This is rendered with  The network name is <b>{internet_access:ssid}</b>
+
+
+
+
+
+  - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
+
+
+
+### organic 
+
+
+
+The question is  Does this shop offer organic products?
+
+
+
+
+
+  - This shop offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - This shop only offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+  - This shop does not offer organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist`
+
+
+
+### questions 
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### reviews 
+
+
+
+Shows the reviews module (including the possibility to leave a review)
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### questions 
+
+
+
+Show the images block at this location
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### minimap 
+
+
+
+Shows a small map with the feature. Added by default to every popup
+
+This tagrendering has no question and is thus read-only
+
+ 
+
+This document is autogenerated from [assets/themes/sports/sports.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/sports/sports.json)
\ No newline at end of file
diff --git a/Docs/Layers/stairs.md b/Docs/Layers/stairs.md
index c3fdf4756..465f164a6 100644
--- a/Docs/Layers/stairs.md
+++ b/Docs/Layers/stairs.md
@@ -110,7 +110,7 @@ The question is  Do these stairs have tactile writing on the handrail?
   - There is no tactile writing on the handrail  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:tactile_writing' target='_blank'>tactile_writing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tactile_writing%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `handrail=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `handrail=yes`
 
 
 
@@ -122,7 +122,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `tactile_writing=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `tactile_writing=yes`
 
 
 
diff --git a/Docs/Layers/street_lamps.md b/Docs/Layers/street_lamps.md
index 5d69cfa9e..0bbae2f25 100644
--- a/Docs/Layers/street_lamps.md
+++ b/Docs/Layers/street_lamps.md
@@ -133,7 +133,7 @@ The question is  How is this lamp mounted to the pole?
   - This lamp sits at the end of a bent mast  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:lamp_mount' target='_blank'>lamp_mount</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:lamp_mount%3Dbent_mast' target='_blank'>bent_mast</a>`
 
 
-Only visible if  `support=pole`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `support=pole`
 
 
 
@@ -203,7 +203,7 @@ This is rendered with  This lamp has {light:count} fixtures
   - This lamp has 2 fixtures  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:light:count' target='_blank'>light:count</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:light:count%3D2' target='_blank'>2</a>`
 
 
-Only visible if  `support=pole`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `support=pole`
 
 
 
@@ -237,6 +237,6 @@ This is rendered with  This lamp points towards {light:direction}
 
 
 
-Only visible if  `light:count=1`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `light:count=1` 
 
 This document is autogenerated from [assets/layers/street_lamps/street_lamps.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/street_lamps/street_lamps.json)
\ No newline at end of file
diff --git a/Docs/Layers/streets_without_etymology.md b/Docs/Layers/streets_without_etymology.md
index ef70dc49f..1c73cc231 100644
--- a/Docs/Layers/streets_without_etymology.md
+++ b/Docs/Layers/streets_without_etymology.md
@@ -168,6 +168,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/surveillance_camera.md b/Docs/Layers/surveillance_camera.md
index 052f7e6b6..ab86d6223 100644
--- a/Docs/Layers/surveillance_camera.md
+++ b/Docs/Layers/surveillance_camera.md
@@ -170,7 +170,7 @@ The question is  Is the public space surveilled by this camera an indoor or outd
   - This option cannot be chosen as answer
 
 
-Only visible if  `surveillance:type=public`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `surveillance:type=public`
 
 
 
@@ -186,7 +186,7 @@ This is rendered with  Located on level {level}
 
 
 
-Only visible if  `indoor=yes|surveillance:type=ye`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=yes|surveillance:type=ye`
 
 
 
diff --git a/Docs/Layers/tertiary_education.md b/Docs/Layers/tertiary_education.md
index be84ce2e8..510a96254 100644
--- a/Docs/Layers/tertiary_education.md
+++ b/Docs/Layers/tertiary_education.md
@@ -102,7 +102,7 @@ The question is  What level of education is given here?
   - Doctorate degrees are awarded here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:isced:2011:level' target='_blank'>isced:2011:level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Ddoctorate' target='_blank'>doctorate</a>`
 
 
-Only visible if  `amenity=university`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=university`
 
 
 
diff --git a/Docs/Layers/toekomstige_fietsstraat.md b/Docs/Layers/toekomstige_fietsstraat.md
index 3bec42998..13fa41a46 100644
--- a/Docs/Layers/toekomstige_fietsstraat.md
+++ b/Docs/Layers/toekomstige_fietsstraat.md
@@ -116,7 +116,7 @@ The question is  What sign does this bicycle road have?
   - There are no supplementary signs at this bicycle road.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DDE:244.1' target='_blank'>DE:244.1</a>`
 
 
-Only visible if  `bicycle_road=yes&_country=de`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `bicycle_road=yes&_country=de`
 
 
 
@@ -132,7 +132,7 @@ This is rendered with  This street will become a cyclestreet at {cyclestreet:sta
 
 
 
-Only visible if  `proposed:cyclestreet=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `proposed:cyclestreet=yes`
 
 
 
diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md
index 31346f129..83759ec6a 100644
--- a/Docs/Layers/toilet.md
+++ b/Docs/Layers/toilet.md
@@ -168,7 +168,7 @@ This is rendered with  The fee is {charge}
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -188,7 +188,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -240,7 +240,7 @@ This is rendered with  The door to the wheelchair-accessible toilet is {canonica
 
 
 
-Only visible if  `wheelchair=yes|wheelchair=designated`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `wheelchair=yes|wheelchair=designated`
 
 
 
@@ -298,7 +298,7 @@ This is rendered with  The changing table is located at {changing_table:location
   - The changing table is in a dedicated room.   corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:changing_table:location' target='_blank'>changing_table:location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room' target='_blank'>dedicated_room</a>`
 
 
-Only visible if  `changing_table=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `changing_table=yes`
 
 
 
diff --git a/Docs/Layers/toilet_at_amenity.md b/Docs/Layers/toilet_at_amenity.md
index ccad95c9d..a92212556 100644
--- a/Docs/Layers/toilet_at_amenity.md
+++ b/Docs/Layers/toilet_at_amenity.md
@@ -166,7 +166,7 @@ This is rendered with  The fee is {toilets:charge}
 
 
 
-Only visible if  `toilets:fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `toilets:fee=yes`
 
 
 
@@ -213,7 +213,7 @@ This is rendered with  The door to the wheelchair-accessible toilet is {canonica
 
 
 
-Only visible if  `toilets:wheelchair=yes|toilets:wheelchair=designated`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `toilets:wheelchair=yes|toilets:wheelchair=designated`
 
 
 
@@ -271,7 +271,7 @@ This is rendered with  The changing table is located at {changing_table:location
   - The changing table is in a dedicated room.   corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:changing_table:location' target='_blank'>changing_table:location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room' target='_blank'>dedicated_room</a>`
 
 
-Only visible if  `changing_table=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `changing_table=yes`
 
 
 
diff --git a/Docs/Layers/toursistic_places_without_etymology.md b/Docs/Layers/toursistic_places_without_etymology.md
index b7be18271..01b76f9cf 100644
--- a/Docs/Layers/toursistic_places_without_etymology.md
+++ b/Docs/Layers/toursistic_places_without_etymology.md
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/transit_stops.md b/Docs/Layers/transit_stops.md
index 20e1edff1..8fe8cf2a1 100644
--- a/Docs/Layers/transit_stops.md
+++ b/Docs/Layers/transit_stops.md
@@ -238,6 +238,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_contained_routes~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `_contained_routes~.+` 
 
 This document is autogenerated from [assets/layers/transit_stops/transit_stops.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/transit_stops/transit_stops.json)
\ No newline at end of file
diff --git a/Docs/Layers/tree_node.md b/Docs/Layers/tree_node.md
index 185f587a1..1260113e2 100644
--- a/Docs/Layers/tree_node.md
+++ b/Docs/Layers/tree_node.md
@@ -98,7 +98,7 @@ This tagrendering has no question and is thus read-only
   - Height: {height}&nbsp;m  corresponds with  `height~^(^[0-9.]+$)$`
 
 
-Only visible if  `height~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `height~.+`
 
 
 
@@ -134,7 +134,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikipedia~.+|wikidata~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `wikipedia~.+|wikidata~.+`
 
 
 
@@ -211,7 +211,7 @@ This is rendered with  Name: {name}
   - The tree does not have a name.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:noname' target='_blank'>noname</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:noname%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument|name~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `denotation=landmark|denotation=natural_monument|name~.+`
 
 
 
@@ -233,7 +233,7 @@ The question is  Is this tree registered heritage?
   - This option cannot be chosen as answer
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `denotation=landmark|denotation=natural_monument`
 
 
 
@@ -249,7 +249,7 @@ This is rendered with  <img src="./assets/layers/tree_node/Onroerend_Erfgoed_log
 
 
 
-Only visible if  `heritage=4&heritage:operator=OnroerendErfgoed`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `heritage=4&heritage:operator=OnroerendErfgoed`
 
 
 
@@ -265,6 +265,6 @@ This is rendered with  <img src="./assets/svg/wikidata.svg" style="width:1em;hei
 
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument|wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `denotation=landmark|denotation=natural_monument|wikidata~.+` 
 
 This document is autogenerated from [assets/layers/tree_node/tree_node.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/tree_node/tree_node.json)
\ No newline at end of file
diff --git a/Docs/Layers/walls_and_buildings.md b/Docs/Layers/walls_and_buildings.md
index 6f44f5f08..5cac01f60 100644
--- a/Docs/Layers/walls_and_buildings.md
+++ b/Docs/Layers/walls_and_buildings.md
@@ -89,6 +89,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_biggest_width_id~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `_biggest_width_id~.+` 
 
 This document is autogenerated from [assets/layers/walls_and_buildings/walls_and_buildings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/walls_and_buildings/walls_and_buildings.json)
\ No newline at end of file
diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json
index 010611a9f..1912fb424 100644
--- a/Docs/TagInfo/mapcomplete_food.json
+++ b/Docs/TagInfo/mapcomplete_food.json
@@ -301,6 +301,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
@@ -331,6 +346,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Restaurants and fast food' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json
index 78009f34c..c41f4c364 100644
--- a/Docs/TagInfo/mapcomplete_fritures.json
+++ b/Docs/TagInfo/mapcomplete_fritures.json
@@ -305,6 +305,21 @@
       "description": "Layer 'Fries shop' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Fries shop' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
@@ -335,6 +350,21 @@
       "description": "Layer 'Fries shop' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Fries shop' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
diff --git a/Docs/TagInfo/mapcomplete_healthcare.json b/Docs/TagInfo/mapcomplete_healthcare.json
index c37550acd..49ecab720 100644
--- a/Docs/TagInfo/mapcomplete_healthcare.json
+++ b/Docs/TagInfo/mapcomplete_healthcare.json
@@ -15,16 +15,6 @@
       "description": "The MapComplete theme Healthcare has a layer Doctors showing features with this tag",
       "value": "doctors"
     },
-    {
-      "key": "amenity",
-      "description": "The MapComplete theme Healthcare has a layer Doctors showing features with this tag",
-      "value": "dentist"
-    },
-    {
-      "key": "healthcare",
-      "description": "The MapComplete theme Healthcare has a layer Doctors showing features with this tag",
-      "value": "physiotherapist"
-    },
     {
       "key": "image",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
@@ -41,10 +31,23 @@
       "key": "wikipedia",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
     },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
@@ -69,10 +72,6 @@
       "key": "contact:website",
       "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
-    {
-      "key": "name",
-      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
-    },
     {
       "key": "healthcare:speciality",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'healthcare:speciality' (in the MapComplete.osm.be theme 'Healthcare')"
@@ -97,6 +96,121 @@
       "description": "Layer 'Doctors' shows healthcare:speciality=paediatrics with a fixed text, namely 'This is a paediatrician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
       "value": "paediatrics"
     },
+    {
+      "key": "healthcare",
+      "description": "The MapComplete theme Healthcare has a layer Physiotherapist showing features with this tag",
+      "value": "physiotherapist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Physiotherapist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "amenity",
+      "description": "The MapComplete theme Healthcare has a layer Dentist showing features with this tag",
+      "value": "dentist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Dentist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Healthcare has a layer Hospitals showing features with this tag",
@@ -132,70 +246,70 @@
     },
     {
       "key": "amenity",
-      "description": "The MapComplete theme Healthcare has a layer pharmacy showing features with this tag",
+      "description": "The MapComplete theme Healthcare has a layer Pharmacies showing features with this tag",
       "value": "pharmacy"
     },
     {
       "key": "image",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "mapillary",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikidata",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikipedia",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "name",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "opening_hours",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "phone",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "email",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "website",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
+      "description": "Layer 'Pharmacies' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
       "value": "yes"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
+      "description": "Layer 'Pharmacies' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
       "value": "no"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
+      "description": "Layer 'Pharmacies' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
       "value": "limited"
     }
   ]
diff --git a/Docs/TagInfo/mapcomplete_indoors.json b/Docs/TagInfo/mapcomplete_indoors.json
index 82d28cff2..353799ecb 100644
--- a/Docs/TagInfo/mapcomplete_indoors.json
+++ b/Docs/TagInfo/mapcomplete_indoors.json
@@ -12,52 +12,52 @@
   "tags": [
     {
       "key": "indoor",
-      "description": "The MapComplete theme Indoors has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Indoors has a layer Indoors showing features with this tag",
       "value": "room"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Indoors has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Indoors has a layer Indoors showing features with this tag",
       "value": "area"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Indoors has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Indoors has a layer Indoors showing features with this tag",
       "value": "wall"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Indoors has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Indoors has a layer Indoors showing features with this tag",
       "value": "door"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Indoors has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Indoors has a layer Indoors showing features with this tag",
       "value": "level"
     },
     {
       "key": "image",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "mapillary",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikidata",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikipedia",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "ref",
-      "description": "Layer 'indoors' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Indoors')"
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Indoors')"
     },
     {
       "key": "name",
-      "description": "Layer 'indoors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Indoors')"
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Indoors')"
     },
     {
       "key": "highway",
diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json
index 0a04bd0e5..2b0326e49 100644
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@@ -798,6 +798,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
@@ -828,6 +843,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Restaurants and fast food' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
@@ -2104,6 +2134,21 @@
       "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "Telekom"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "no"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme OnWheels has a layer Toilets showing features with this tag",
@@ -2315,70 +2360,70 @@
     },
     {
       "key": "amenity",
-      "description": "The MapComplete theme OnWheels has a layer pharmacy showing features with this tag",
+      "description": "The MapComplete theme OnWheels has a layer Pharmacies showing features with this tag",
       "value": "pharmacy"
     },
     {
       "key": "image",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "mapillary",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikidata",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikipedia",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "name",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "opening_hours",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "phone",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "website",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "description": "Layer 'Pharmacies' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "yes"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "description": "Layer 'Pharmacies' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "no"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "description": "Layer 'Pharmacies' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "limited"
     },
     {
@@ -2386,16 +2431,6 @@
       "description": "The MapComplete theme OnWheels has a layer Doctors showing features with this tag",
       "value": "doctors"
     },
-    {
-      "key": "amenity",
-      "description": "The MapComplete theme OnWheels has a layer Doctors showing features with this tag",
-      "value": "dentist"
-    },
-    {
-      "key": "healthcare",
-      "description": "The MapComplete theme OnWheels has a layer Doctors showing features with this tag",
-      "value": "physiotherapist"
-    },
     {
       "key": "image",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
@@ -2412,10 +2447,23 @@
       "key": "wikipedia",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'OnWheels')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'OnWheels')"
     },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'OnWheels')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'OnWheels')"
@@ -2440,10 +2488,6 @@
       "key": "contact:website",
       "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
-    {
-      "key": "name",
-      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'OnWheels')"
-    },
     {
       "key": "healthcare:speciality",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'healthcare:speciality' (in the MapComplete.osm.be theme 'OnWheels')"
diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json
index 0ea23825d..d58faebc5 100644
--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
@@ -4752,18 +4752,61 @@
     },
     {
       "key": "amenity",
-      "description": "The MapComplete theme Personal theme has a layer Doctors showing features with this tag",
-      "value": "doctors"
+      "description": "The MapComplete theme Personal theme has a layer Dentist showing features with this tag",
+      "value": "dentist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Dentist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "amenity",
       "description": "The MapComplete theme Personal theme has a layer Doctors showing features with this tag",
-      "value": "dentist"
-    },
-    {
-      "key": "healthcare",
-      "description": "The MapComplete theme Personal theme has a layer Doctors showing features with this tag",
-      "value": "physiotherapist"
+      "value": "doctors"
     },
     {
       "key": "image",
@@ -4781,10 +4824,23 @@
       "key": "wikipedia",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
     },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
@@ -4809,10 +4865,6 @@
       "key": "contact:website",
       "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
-    {
-      "key": "name",
-      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
-    },
     {
       "key": "healthcare:speciality",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'healthcare:speciality' (in the MapComplete.osm.be theme 'Personal theme')"
@@ -5974,6 +6026,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
@@ -6004,6 +6071,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Restaurants and fast food' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
@@ -6615,52 +6697,52 @@
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Personal theme has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Personal theme has a layer Indoors showing features with this tag",
       "value": "room"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Personal theme has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Personal theme has a layer Indoors showing features with this tag",
       "value": "area"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Personal theme has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Personal theme has a layer Indoors showing features with this tag",
       "value": "wall"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Personal theme has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Personal theme has a layer Indoors showing features with this tag",
       "value": "door"
     },
     {
       "key": "indoor",
-      "description": "The MapComplete theme Personal theme has a layer indoors showing features with this tag",
+      "description": "The MapComplete theme Personal theme has a layer Indoors showing features with this tag",
       "value": "level"
     },
     {
       "key": "image",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "mapillary",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikidata",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikipedia",
-      "description": "The layer 'indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Indoors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "ref",
-      "description": "Layer 'indoors' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "name",
-      "description": "Layer 'indoors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "information",
@@ -7590,72 +7672,134 @@
     },
     {
       "key": "amenity",
-      "description": "The MapComplete theme Personal theme has a layer pharmacy showing features with this tag",
+      "description": "The MapComplete theme Personal theme has a layer Pharmacies showing features with this tag",
       "value": "pharmacy"
     },
     {
       "key": "image",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "mapillary",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikidata",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikipedia",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "name",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "website",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "description": "Layer 'Pharmacies' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "yes"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "description": "Layer 'Pharmacies' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "no"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "description": "Layer 'Pharmacies' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "limited"
     },
+    {
+      "key": "healthcare",
+      "description": "The MapComplete theme Personal theme has a layer Physiotherapist showing features with this tag",
+      "value": "physiotherapist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Physiotherapist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "leisure",
       "description": "The MapComplete theme Personal theme has a layer Picnic tables showing features with this tag",
@@ -9646,6 +9790,21 @@
       "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "Telekom"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "no"
+    },
     {
       "key": "highway",
       "description": "The MapComplete theme Personal theme has a layer Speed Camera showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json
index 94cbd41ae..3fef14742 100644
--- a/Docs/TagInfo/mapcomplete_pets.json
+++ b/Docs/TagInfo/mapcomplete_pets.json
@@ -371,6 +371,21 @@
       "description": "Layer 'Dog friendly eateries' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Dog friendly eateries' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
@@ -401,6 +416,21 @@
       "description": "Layer 'Dog friendly eateries' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Dog friendly eateries' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
@@ -1499,6 +1529,21 @@
       "description": "Layer 'Dog-friendly shops' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
       "value": "Telekom"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog-friendly shops' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog-friendly shops' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog-friendly shops' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "no"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Veterinarians, dog parks and other pet-amenities has a layer veterinary showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_shops.json b/Docs/TagInfo/mapcomplete_shops.json
index 4f2f75f58..75cfc43ce 100644
--- a/Docs/TagInfo/mapcomplete_shops.json
+++ b/Docs/TagInfo/mapcomplete_shops.json
@@ -979,72 +979,87 @@
       "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
       "value": "Telekom"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
+      "value": "no"
+    },
     {
       "key": "amenity",
-      "description": "The MapComplete theme Open Shop Map has a layer pharmacy showing features with this tag",
+      "description": "The MapComplete theme Open Shop Map has a layer Pharmacies showing features with this tag",
       "value": "pharmacy"
     },
     {
       "key": "image",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "mapillary",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikidata",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "wikipedia",
-      "description": "The layer 'pharmacy allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+      "description": "The layer 'Pharmacies allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
     {
       "key": "name",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "opening_hours",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "phone",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "email",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "website",
-      "description": "Layer 'pharmacy' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Pharmacies' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
+      "description": "Layer 'Pharmacies' shows wheelchair=yes with a fixed text, namely 'This pharmacy is easy to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
       "value": "yes"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
+      "description": "Layer 'Pharmacies' shows wheelchair=no with a fixed text, namely 'This pharmacy is hard to access on a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
       "value": "no"
     },
     {
       "key": "wheelchair",
-      "description": "Layer 'pharmacy' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
+      "description": "Layer 'Pharmacies' shows wheelchair=limited with a fixed text, namely 'This pharmacy has limited access for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Shop Map')",
       "value": "limited"
     }
   ]
diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json
index 0a5055498..5bba319e4 100644
--- a/Docs/TagInfo/mapcomplete_sports.json
+++ b/Docs/TagInfo/mapcomplete_sports.json
@@ -1453,6 +1453,21 @@
       "key": "internet_access:ssid",
       "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
       "value": "Telekom"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
+      "value": "no"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/Themes/healthcare.md b/Docs/Themes/healthcare.md
index 0c44ac097..ad9eecf4b 100644
--- a/Docs/Themes/healthcare.md
+++ b/Docs/Themes/healthcare.md
@@ -12,6 +12,8 @@ This theme contains the following layers:
 
 
   - [doctors](../Layers/doctors.md)
+  - [physiotherapist](../Layers/physiotherapist.md)
+  - [dentist](../Layers/dentist.md)
   - [hospital](../Layers/hospital.md)
   - [pharmacy](../Layers/pharmacy.md)
   - [gps_location](../Layers/gps_location.md)
diff --git a/Docs/Themes/maproulette.md b/Docs/Themes/maproulette.md
index 7234ffd56..d78db852b 100644
--- a/Docs/Themes/maproulette.md
+++ b/Docs/Themes/maproulette.md
@@ -28,6 +28,7 @@ Available languages:
   - da
   - ca
   - pa_PK
+  - nl
  
 
 This document is autogenerated from [assets/themes/maproulette/maproulette.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/maproulette/maproulette.json)
\ No newline at end of file
diff --git a/Docs/Themes/personal.md b/Docs/Themes/personal.md
index 317f1f790..c792755e4 100644
--- a/Docs/Themes/personal.md
+++ b/Docs/Themes/personal.md
@@ -37,6 +37,7 @@ This theme contains the following layers:
   - [crossings](../Layers/crossings.md)
   - [cycleways_and_roads](../Layers/cycleways_and_roads.md)
   - [defibrillator](../Layers/defibrillator.md)
+  - [dentist](../Layers/dentist.md)
   - [doctors](../Layers/doctors.md)
   - [dogpark](../Layers/dogpark.md)
   - [drinking_water](../Layers/drinking_water.md)
@@ -69,6 +70,7 @@ This theme contains the following layers:
   - [parking_spaces](../Layers/parking_spaces.md)
   - [pedestrian_path](../Layers/pedestrian_path.md)
   - [pharmacy](../Layers/pharmacy.md)
+  - [physiotherapist](../Layers/physiotherapist.md)
   - [picnic_table](../Layers/picnic_table.md)
   - [playground](../Layers/playground.md)
   - [postboxes](../Layers/postboxes.md)
diff --git a/Docs/Themes/sports.md b/Docs/Themes/sports.md
index e890dd5c9..17a29c992 100644
--- a/Docs/Themes/sports.md
+++ b/Docs/Themes/sports.md
@@ -15,7 +15,7 @@ This theme contains the following layers:
   - [fitness_centre](../Layers/fitness_centre.md)
   - [fitness_station](../Layers/fitness_station.md)
   - [sports_centre](../Layers/sports_centre.md)
-  - [shops](../Layers/shops.md)
+  - [sport_shops](../Layers/sport_shops.md)
   - [gps_location](../Layers/gps_location.md)
   - [gps_location_history](../Layers/gps_location_history.md)
   - [home_location](../Layers/home_location.md)
diff --git a/Docs/Themes/transit.md b/Docs/Themes/transit.md
index e1e19c774..c9a0759b3 100644
--- a/Docs/Themes/transit.md
+++ b/Docs/Themes/transit.md
@@ -33,6 +33,7 @@ Available languages:
   - nb_NO
   - ca
   - pa_PK
+  - nl
  
 
 This document is autogenerated from [assets/themes/transit/transit.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/transit/transit.json)
\ No newline at end of file
diff --git a/Docs/Themes/walls_and_buildings.md b/Docs/Themes/walls_and_buildings.md
index 476108b54..2633d2eeb 100644
--- a/Docs/Themes/walls_and_buildings.md
+++ b/Docs/Themes/walls_and_buildings.md
@@ -30,6 +30,7 @@ Available languages:
   - fr
   - da
   - nb_NO
+  - nl
  
 
 This document is autogenerated from [assets/themes/walls_and_buildings/walls_and_buildings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/walls_and_buildings/walls_and_buildings.json)
\ No newline at end of file
diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt
index 0b7e9fbe0..7be7f5325 100644
--- a/Docs/wikiIndex.txt
+++ b/Docs/wikiIndex.txt
@@ -274,7 +274,7 @@
 {{service_item
 |name= [https://mapcomplete.osm.be/indoors indoors]
 |region= Worldwide
-|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:_context|en}}
+|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:nl|en}}, {{#language:_context|en}}
 |descr= A MapComplete theme: On this map, publicly accessible indoor places are shown
 |material= {{yes|[https://mapcomplete.osm.be/ Yes]}}
 |image= MapComplete_Screenshot.png
@@ -445,7 +445,7 @@
 {{service_item
 |name= [https://mapcomplete.osm.be/transit transit]
 |region= Worldwide
-|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:_context|en}}
+|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:nl|en}}, {{#language:_context|en}}
 |descr= A MapComplete theme: Plan your trip with the help of the public transport system
 |material= {{yes|[https://mapcomplete.osm.be/ Yes]}}
 |image= MapComplete_Screenshot.png
diff --git a/assets/contributors.json b/assets/contributors.json
index 2499ad139..91b88a085 100644
--- a/assets/contributors.json
+++ b/assets/contributors.json
@@ -1,11 +1,11 @@
 {
   "contributors": [
     {
-      "commits": 4661,
+      "commits": 4686,
       "contributor": "Pieter Vander Vennet"
     },
     {
-      "commits": 255,
+      "commits": 259,
       "contributor": "Robin van der Linde"
     },
     {
@@ -48,6 +48,10 @@
       "commits": 21,
       "contributor": "AlexanderRebai"
     },
+    {
+      "commits": 19,
+      "contributor": "Hosted Weblate"
+    },
     {
       "commits": 19,
       "contributor": "Niels Elgaard Larsen"
@@ -60,10 +64,6 @@
       "commits": 19,
       "contributor": "Sebastian Kürten"
     },
-    {
-      "commits": 18,
-      "contributor": "Hosted Weblate"
-    },
     {
       "commits": 18,
       "contributor": "Arno Deceuninck"
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index e6121d561..1b53d92b9 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -3133,7 +3133,7 @@
       },
       "render": {
         "en": "<div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (a branded Type 2 CSS)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> outputs at most {socket:tesla_supercharger_ccs:output}",
-        "nl": "<div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (een type2 CCS met Tesla-logo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> levert een vermogen van maximaal {socket:tesla_supercharger_ccs:output}",
+        "nl": "<div style='display: inline-block'><div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (een type2 CCS met Tesla-logo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> levert een vermogen van maximaal {socket:tesla_supercharger_ccs:output}",
         "de": "<div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (Typ 2 CSS von Tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> liefert maximal {socket:tesla_supercharger_ccs:output}"
       },
       "freeform": {
diff --git a/assets/layers/climbing_area/climbing_area.json b/assets/layers/climbing_area/climbing_area.json
index 387d4fa35..86b91489e 100644
--- a/assets/layers/climbing_area/climbing_area.json
+++ b/assets/layers/climbing_area/climbing_area.json
@@ -201,7 +201,7 @@
             "fr": "Rocher d’escalade, rocher avec une ou peu de voie permettant d’escalader sans corde",
             "de": "Ein Kletterfelsen - ein einzelner Felsen oder eine Klippe mit einer oder wenigen Kletterrouten, die ohne Seil sicher bestiegen werden können",
             "it": "Un masso per arrampicata (una singola roccia o falesia con una o poche vie di arrampicata che possono essere scalate in sicurezza senza una corda)",
-            "nl": "Een klimboulder- eenn enkele rots of klif met één of enkele klimroutes die veilig zonder touw kunnen worden beklommen"
+            "nl": "Een klimboulder - een enkele rots of klif met één of enkele klimroutes die veilig zonder touw kunnen worden beklommen"
           }
         },
         {
diff --git a/assets/layers/dentist/dentist.json b/assets/layers/dentist/dentist.json
index 6c89b6de7..69c655d5a 100644
--- a/assets/layers/dentist/dentist.json
+++ b/assets/layers/dentist/dentist.json
@@ -2,13 +2,15 @@
   "id": "dentist",
   "name": {
     "en": "Dentist",
-    "nl": "Tandarts"
+    "nl": "Tandarts",
+    "de": "Zahnarzt"
   },
   "description": {
-    "en": "This layer shows dentist offices"
+    "en": "This layer shows dentist offices",
+    "de": "Diese Ebene zeigt Zahnarztpraxen"
   },
   "source": {
-    "osmTags":      "amenity=dentist"
+    "osmTags": "amenity=dentist"
   },
   "title": {
     "render": {
@@ -27,10 +29,12 @@
     "website",
     {
       "question": {
-        "en": "What is the name of this dentist?"
+        "en": "What is the name of this dentist?",
+        "de": "Wie lautet der Name dieses Zahnarztes?"
       },
       "render": {
-        "en": "This dentist is called {name}"
+        "en": "This dentist is called {name}",
+        "de": "Dieser Zahnarzt heißt {name}"
       },
       "freeform": {
         "key": "name"
@@ -68,4 +72,4 @@
   ],
   "deletion": true,
   "allowMove": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json
index 34b1b78b9..ee3ba379a 100644
--- a/assets/layers/doctors/doctors.json
+++ b/assets/layers/doctors/doctors.json
@@ -8,11 +8,11 @@
     "pa_PK": "ڈاکٹر"
   },
   "description": {
-    "en": "This layer shows doctor offices"
+    "en": "This layer shows doctor offices",
+    "de": "Diese Ebene zeigt Arztpraxen, Zahnärzte und andere Gesundheitseinrichtungen"
   },
   "source": {
-    "osmTags":         "amenity=doctors"
-    
+    "osmTags": "amenity=doctors"
   },
   "title": {
     "render": {
@@ -24,7 +24,6 @@
   },
   "minzoom": 13,
   "tagRenderings": [
-    
     "images",
     {
       "question": {
@@ -136,4 +135,4 @@
   ],
   "deletion": true,
   "allowMove": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index 97e293595..0ffbed0d3 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -164,7 +164,9 @@
             ]
           },
           "question": {
-            "en": "Has organic options"
+            "en": "Has organic options",
+            "de": "Hat Bio-Produkte",
+            "nl": "Heeft biologische opties"
           }
         }
       ]
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 3b3bbfd40..0aa460fa8 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -609,25 +609,33 @@
     {
       "id": "organic (no friture)",
       "question": {
-        "en": "Does this restaurant offer organic food?"
+        "en": "Does this restaurant offer organic food?",
+        "de": "Bietet dieses Restaurant biologische Speisen an?",
+        "nl": "Biedt dit restaurant biologisch eten?"
       },
       "mappings": [
         {
           "if": "organic=no",
           "then": {
-            "en": "There are no organic options available"
+            "en": "There are no organic options available",
+            "de": "Es sind keine biologischen Produkte verfügbar",
+            "nl": "Er zijn geen biologische opties beschikbaar"
           }
         },
         {
           "if": "organic=yes",
           "then": {
-            "en": "There is an organic menu"
+            "en": "There is an organic menu",
+            "de": "Es gibt ein biologisches Menü",
+            "nl": "Er is een biologisch menu"
           }
         },
         {
           "if": "organic=only",
           "then": {
-            "en": "Only organic options are available"
+            "en": "Only organic options are available",
+            "de": "Nur biologische Produkte sind erhältlich",
+            "nl": "Er zijn alleen biologische opties beschikbaar"
           }
         }
       ],
@@ -715,28 +723,32 @@
       "id": "friture-organic",
       "question": {
         "en": "Does this fries shop offer organic snacks?",
-        "nl": "Heeft deze frituur biologische snacks?"
+        "nl": "Heeft deze frituur biologische snacks?",
+        "de": "Bietet diese Pommesbude biologische Snacks an?"
       },
       "mappings": [
         {
           "if": "organic=yes",
           "then": {
             "en": "Organic snacks are available",
-            "nl": "Er zijn biologische snacks aanwezig"
+            "nl": "Er zijn biologische snacks aanwezig",
+            "de": "Biologische Snacks sind erhältlich"
           }
         },
         {
           "if": "organic=no",
           "then": {
             "en": "No organic snacks are available",
-            "nl": "Geen biologische snacks beschikbaar"
+            "nl": "Geen biologische snacks beschikbaar",
+            "de": "Es sind keine biologischen Snacks erhältlich"
           }
         },
         {
           "if": "organic=only",
           "then": {
             "en": "Only organic snacks are available",
-            "nl": "Enkel biologische snacks zijn beschikbaar"
+            "nl": "Enkel biologische snacks zijn beschikbaar",
+            "de": "Nur biologische Snacks sind erhältlich"
           }
         }
       ],
diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json
index 095b5e8b0..2825ef30a 100644
--- a/assets/layers/indoors/indoors.json
+++ b/assets/layers/indoors/indoors.json
@@ -1,7 +1,7 @@
 {
   "id": "indoors",
   "name": {
-    "en": "indoors",
+    "en": "Indoors",
     "de": "Innenräume",
     "nl": "Binnenruimtes",
     "pa_PK": "اندروں"
diff --git a/assets/layers/pharmacy/pharmacy.json b/assets/layers/pharmacy/pharmacy.json
index f362393d6..73b592f5a 100644
--- a/assets/layers/pharmacy/pharmacy.json
+++ b/assets/layers/pharmacy/pharmacy.json
@@ -1,9 +1,9 @@
 {
   "id": "pharmacy",
   "name": {
-    "en": "pharmacy",
-    "de": "Apotheke",
-    "nl": "apotheek",
+    "en": "Pharmacies",
+    "de": "Apotheken",
+    "nl": "Apotheken",
     "pa_PK": "فارمیسی"
   },
   "description": {
diff --git a/assets/layers/physiotherapist/physiotherapist.json b/assets/layers/physiotherapist/physiotherapist.json
index 0f878b985..ebd4772f5 100644
--- a/assets/layers/physiotherapist/physiotherapist.json
+++ b/assets/layers/physiotherapist/physiotherapist.json
@@ -2,11 +2,13 @@
   "id": "physiotherapist",
   "name": {
     "en": "Physiotherapist",
-    "nl": "Kinesist"
+    "nl": "Kinesist",
+    "de": "Physiotherapeut"
   },
   "description": {
     "en": "This layer shows physiotherapists",
-    "nl": "Deze laag toont kinesisten"
+    "nl": "Deze laag toont kinesisten",
+    "de": "Diese Ebene zeigt Physiotherapeuten"
   },
   "source": {
     "osmTags": "healthcare=physiotherapist"
@@ -14,7 +16,8 @@
   "title": {
     "render": {
       "en": "Physiotherapist {name}",
-      "nl": "Kinesist {name}"
+      "nl": "Kinesist {name}",
+      "de": "Physiotherapeut {name}"
     }
   },
   "minzoom": 13,
@@ -23,11 +26,13 @@
     {
       "question": {
         "en": "What is the name of this physiotherapists office?",
-        "nl": "Wat is de naam van deze kinesistenpraktijk?"
+        "nl": "Wat is de naam van deze kinesistenpraktijk?",
+        "de": "Wie heißt die Praxis des Physiotherapeuten?"
       },
       "render": {
         "en": "This physiotherapists office is called {name}",
-        "nl": "Deze kinesistenpraktijk heet {name}"
+        "nl": "Deze kinesistenpraktijk heet {name}",
+        "de": "Die Praxis des Physiotherapeuten heißt {name}"
       },
       "freeform": {
         "key": "name"
@@ -38,7 +43,6 @@
     "phone",
     "email",
     "website"
-
   ],
   "presets": [
     {
@@ -70,4 +74,4 @@
   ],
   "deletion": true,
   "allowMove": true
-}
+}
\ No newline at end of file
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 723c097d8..7d03d65dc 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -209,25 +209,33 @@
     {
       "id": "organic",
       "question": {
-        "en": "Does this shop offer organic products?"
+        "en": "Does this shop offer organic products?",
+        "de": "Bietet dieses Geschäft Bioprodukte an?",
+        "nl": "Biedt deze winkel biologische producten aan?"
       },
       "mappings": [
         {
           "if": "organic=yes",
           "then": {
-            "en": "This shop offers organic products"
+            "en": "This shop offers organic products",
+            "de": "Dieses Geschäft bietet Bio-Produkte an",
+            "nl": "Deze winkel biedt biologische producten aan"
           }
         },
         {
           "if": "organic=only",
           "then": {
-            "en": "This shop only offers organic products"
+            "en": "This shop only offers organic products",
+            "de": "Dieses Geschäft bietet ausschließlich Bio-Produkte an",
+            "nl": "Deze winkel biedt uitluitend biologische producten aan"
           }
         },
         {
           "if": "organic=no",
           "then": {
-            "en": "This shop does not offer organic products"
+            "en": "This shop does not offer organic products",
+            "de": "Dieses Geschäft bietet keine Bioprodukte an",
+            "nl": "Deze winkel heeft geen biologische producten"
           }
         }
       ],
diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json
index 48c76d0d2..437fbadd7 100644
--- a/assets/layers/transit_stops/transit_stops.json
+++ b/assets/layers/transit_stops/transit_stops.json
@@ -62,7 +62,8 @@
       "render": {
         "en": "This stop is called <b>{name}</b>",
         "de": "Der Name der Haltestelle lautet <b>{name}</b>",
-        "da": "Dette stop hedder <b>{name}</b>"
+        "da": "Dette stop hedder <b>{name}</b>",
+        "nl": "Deze halte heet <b>{name}</b>"
       },
       "freeform": {
         "key": "name",
@@ -73,7 +74,8 @@
         "placeholder": {
           "en": "Name of the stop",
           "de": "Name der Haltestelle",
-          "da": "Navn på stoppestedet"
+          "da": "Navn på stoppestedet",
+          "nl": "Naam van de halte"
         }
       },
       "mappings": [
@@ -87,14 +89,16 @@
           "then": {
             "en": "This stop has no name",
             "de": "Die Haltestelle hat keinen Namen",
-            "da": "Dette stop har intet navn"
+            "da": "Dette stop har intet navn",
+            "nl": "Deze halte heeft geen naam"
           }
         }
       ],
       "question": {
         "en": "What is the name of this stop?",
         "de": "Wie lautet der Name der Haltestelle?",
-        "da": "Hvad er navnet på dette stop?"
+        "da": "Hvad er navnet på dette stop?",
+        "nl": "Wat is de naam van deze halte?"
       }
     },
     "images",
@@ -106,7 +110,8 @@
           "then": {
             "en": "This stop has a shelter",
             "de": "Die Haltestelle hat einen Unterstand",
-            "da": "Dette stop har et ly"
+            "da": "Dette stop har et ly",
+            "nl": "Deze halte heeft een schuilplaats"
           }
         },
         {
@@ -114,14 +119,16 @@
           "then": {
             "en": "This stop does not have a shelter",
             "de": "Die Haltestelle hat keinen Unterstand",
-            "da": "Dette stop har ikke et ly"
+            "da": "Dette stop har ikke et ly",
+            "nl": "Deze halte heeft geen schuilplaats"
           }
         },
         {
           "if": "shelter=separate",
           "then": {
             "en": "This stop has a shelter, that's separately mapped",
-            "de": "Die Haltestelle hat einen Unterstand, der separat kariert ist"
+            "de": "Die Haltestelle hat einen Unterstand, der separat kariert ist",
+            "nl": "Deze halte heeft een schuilplaats, die apart op de kaart staat"
           },
           "hideInAnswer": true
         }
@@ -129,7 +136,8 @@
       "question": {
         "en": "Does this stop have a shelter?",
         "de": "Hat die Haltestelle einen Unterstand?",
-        "da": "Har dette stop et ly?"
+        "da": "Har dette stop et ly?",
+        "nl": "Heeft deze halte een schuilplaats?"
       }
     },
     {
@@ -239,7 +247,8 @@
           "if": "lit=yes",
           "then": {
             "en": "This stop is lit",
-            "de": "Die Haltestelle ist beleuchtet"
+            "de": "Die Haltestelle ist beleuchtet",
+            "nl": "Deze halte is niet verlicht"
           }
         },
         {
@@ -247,13 +256,15 @@
           "then": {
             "en": "This stop is not lit",
             "de": "Die Haltestelle ist nicht beleuchtet",
-            "da": "Dette stop lyser ikke"
+            "da": "Dette stop lyser ikke",
+            "nl": "Deze halte is niet verlicht"
           }
         }
       ],
       "question": {
         "en": "Is this stop lit?",
-        "de": "Ist die Haltestelle beleuchtet?"
+        "de": "Ist die Haltestelle beleuchtet?",
+        "nl": "Is deze halte verlicht?"
       }
     },
     {
diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
index 7ffbd8edb..e21df55c2 100644
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -13,7 +13,7 @@
   },
   "description": {
     "en": "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.",
-    "nl": "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.",
+    "nl": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker.",
     "de": "Spezielle Ebene, die alle Wände und Gebäude bereitstellt. Diese Ebene ist nützlich in Voreinstellungen für Objekte, 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 umgeschaltet werden.",
     "fr": "Couche intégrée spéciale fournissant tous les murs et bâtiments. Cette couche est utile dans les préréglages pour les objets qui peuvent être placés contre les murs (par exemple, les DEA, les boîtes aux lettres, les entrées, les adresses, les caméras de surveillance, …). Ce calque est invisible par défaut et non inchangeable par l'utilisateur.",
     "da": "Specielt indbygget lag giver alle vægge og bygninger. Dette lag er nyttigt i forudindstillinger til objekter, der kan placeres mod vægge (f.eks. AED'er, postkasser, indgange, adresser, overvågningskameraer, …). Dette lag er usynligt som standard og kan ikke skiftes af brugeren."
@@ -74,7 +74,8 @@
             "en": "meter",
             "fr": "mètre",
             "de": "Meter",
-            "da": "meter"
+            "da": "meter",
+            "nl": "meter"
           }
         },
         {
@@ -88,7 +89,8 @@
             "en": "centimeter",
             "fr": "centimètre",
             "de": "Zentimeter",
-            "da": "centimeter"
+            "da": "centimeter",
+            "nl": "centimeter"
           }
         }
       ]
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 95a79226d..7addf9700 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -688,13 +688,15 @@
         {
           "if": "opening_hours=\"by appointment\"",
           "then": {
-            "en": "Only by appointment"
+            "en": "Only by appointment",
+            "de": "Nur nach Vereinbarung"
           }
         },
         {
           "if": "opening_hours~i~\"by appointment\"|by appointment",
           "then": {
-            "en": "Only by appointment"
+            "en": "Only by appointment",
+            "de": "Nur nach Vereinbarung"
           },
           "hideInAnswer": true
         }
@@ -1491,4 +1493,4 @@
       "es": "El nombre de red es <b>{internet_access:ssid}</b>"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/assets/themes/bag/bag.json b/assets/themes/bag/bag.json
index 02a8a9876..770765b6d 100644
--- a/assets/themes/bag/bag.json
+++ b/assets/themes/bag/bag.json
@@ -83,7 +83,8 @@
           "id": "Reference",
           "render": {
             "en": "The reference in BAG is <b>{ref:bag}</b>",
-            "de": "Die Referenz in BAG ist <b>{ref:bag}</b>"
+            "de": "Die Referenz in BAG ist <b>{ref:bag}</b>",
+            "nl": "De referentie in BAG is <b>{ref:bag}</b>"
           },
           "mappings": [
             {
@@ -91,7 +92,8 @@
               "then": {
                 "en": "This building has no reference in the BAG",
                 "cs": "Tato budova nemá v BAG žádný odkaz",
-                "de": "Dieses Gebäude hat keinen Verweis im BAG"
+                "de": "Dieses Gebäude hat keinen Verweis im BAG",
+                "nl": "Dit gebouw heeft geen referentie in de BAG"
               }
             }
           ]
@@ -152,7 +154,8 @@
       "title": "BAG Building",
       "description": {
         "en": "Buildings from BAG register",
-        "de": "Gebäude aus dem BAG-Register"
+        "de": "Gebäude aus dem BAG-Register",
+        "nl": "Gebouw uit de BAG"
       },
       "source": {
         "geoJson": "https://service.pdok.nl/lv/bag/wfs/v2_0?request=GetFeature&service=WFS&version=2.0.0&outputFormat=application%2Fjson%3B%20subtype%3Dgeojson&typeName=bag%3Apand&bbox={x_min}%2C{y_min}%2C{x_max}%2C{y_max}%2CCRS84&srsName=EPSG%3A4326",
@@ -214,7 +217,8 @@
               },
               "then": {
                 "en": "Didn't calculate the correct values yet. Refresh this page",
-                "de": "Richtige Werte noch nicht berechnet. Aktualisieren Sie diese Seite"
+                "de": "Richtige Werte noch nicht berechnet. Aktualisieren Sie diese Seite",
+                "nl": "Correcte waarden nog niet berekend. Herlaad deze pagina"
               }
             },
             {
@@ -237,7 +241,8 @@
           "id": "Reference",
           "render": {
             "en": "The reference in BAG is <b>{_bag_obj:ref:bag}</b>",
-            "de": "Die Referenz in BAG ist <b>{_bag_obj:ref:bag}</b>"
+            "de": "Die Referenz in BAG ist <b>{_bag_obj:ref:bag}</b>",
+            "nl": "De referentie in BAG is <b>{_bag_obj:ref:bag}</b>"
           }
         },
         {
@@ -245,14 +250,16 @@
           "render": {
             "en": "This building was built in <b>{_bag_obj:start_date}</b>",
             "de": "Dieses Gebäude wurde gebaut in <b>{_bag_obj:start_date}</b>",
-            "pt_BR": "Esta construção é de <b>{_bag_obj:start_date}</b>"
+            "pt_BR": "Esta construção é de <b>{_bag_obj:start_date}</b>",
+            "nl": "Dit gebouw is gebouwd in <b>{_bag_obj:start_date}</b>"
           },
           "mappings": [
             {
               "if": "_bag_obj:in_construction=true",
               "then": {
                 "en": "The building was started in <b>{_bag_obj:start_date}</b>",
-                "de": "Der Bau wurde in <b>{_bag_obj:start_date}</b> begonnen"
+                "de": "Der Bau wurde in <b>{_bag_obj:start_date}</b> begonnen",
+                "nl": "De bouw van dit gebouw is gestart in <b>{_bag_obj:start_date}</b>"
               }
             }
           ]
@@ -261,14 +268,16 @@
           "id": "Building type",
           "render": {
             "en": "The building type is a <b>{_bag_obj:building}</b>",
-            "de": "Der Gebäudetyp ist ein <b>{_bag_obj:building}</b>"
+            "de": "Der Gebäudetyp ist ein <b>{_bag_obj:building}</b>",
+            "nl": "Het gebouwtype is <b>{_bag_obj:building}</b>"
           },
           "mappings": [
             {
               "if": "_bag_obj:in_construction=true",
               "then": {
                 "en": "The building type will be a <b>{_bag_obj:construction}</b>",
-                "de": "Der Gebäudetyp ist ein <b>{_bag_obj:construction}</b>"
+                "de": "Der Gebäudetyp ist ein <b>{_bag_obj:construction}</b>",
+                "nl": "Het gebouwtype wordt <b>{_bag_obj:construction}</b>"
               }
             }
           ]
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index 4523eb14d..f35a42344 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -404,7 +404,8 @@
             "if": "bicycle_road=yes",
             "then": {
               "en": "This street is a bicycle road",
-              "de": "Diese Straße ist eine Fahrradstraße"
+              "de": "Diese Straße ist eine Fahrradstraße",
+              "nl": "Deze straat is een fietsstraat"
             },
             "hideInAnswer": true
           },
@@ -421,7 +422,8 @@
             },
             "then": {
               "en": "This street is a bicycle road (has a speed limit of 30 km/h and vehicles are not allowed) (sign will be asked later)",
-              "de": "Diese Straße ist eine Fahrradstraße (hat eine Geschwindigkeitsbegrenzung von 30 km/h und Fahrzeuge sind nicht erlaubt) (Schild wird später abgefragt)"
+              "de": "Diese Straße ist eine Fahrradstraße (hat eine Geschwindigkeitsbegrenzung von 30 km/h und Fahrzeuge sind nicht erlaubt) (Schild wird später abgefragt)",
+              "nl": "Deze straat is een fietsstraat (snelheid van 30 km/h en voertuigen niet toegestaan) (bord wordt later gevraagd)"
             },
             "hideInAnswer": "_country!=de"
           },
@@ -483,7 +485,8 @@
             },
             "then": {
               "en": "This street will become a bicycle road soon",
-              "de": "Diese Straße wird bald zu einer Fahrradstraße"
+              "de": "Diese Straße wird bald zu einer Fahrradstraße",
+              "nl": "Deze straat wordt binnenkort een fietsstraat"
             },
             "hideInAnswer": "_country!=de"
           },
@@ -522,14 +525,16 @@
         },
         "question": {
           "en": "What sign does this bicycle road have?",
-          "de": "Welches Schild hat diese Fahrradstraße?"
+          "de": "Welches Schild hat diese Fahrradstraße?",
+          "nl": "Welk bord heeft deze fietsstraat?"
         },
         "mappings": [
           {
             "if": "traffic_sign=DE:244.1,1020-30",
             "then": {
               "en": "Residents allowed",
-              "de": "Anlieger frei"
+              "de": "Anlieger frei",
+              "nl": "Aanwonenden toegestaan"
             },
             "icon": {
               "path": "./assets/themes/cyclestreets/Zeichen_244_1020-30.svg",
@@ -546,7 +551,8 @@
             "if": "traffic_sign=DE:244.1,1022-12,1024-10",
             "then": {
               "en": "Motor vehicles allowed",
-              "de": "KFZ frei"
+              "de": "KFZ frei",
+              "nl": "Motorvoertuigen toegestaan"
             },
             "icon": {
               "path": "./assets/themes/cyclestreets/Zeichen_244_KFZ_frei.svg",
@@ -564,7 +570,8 @@
             "then": {
               "en": "Motorcycles allowed",
               "de": "Motorräder frei",
-              "pa_PK": "موٹرسائیکلاں دی اِجازت اے"
+              "pa_PK": "موٹرسائیکلاں دی اِجازت اے",
+              "nl": "Motoren toegestaan"
             },
             "icon": {
               "path": "./assets/themes/cyclestreets/Zeichen_244_1022-12.svg",
@@ -582,7 +589,8 @@
             "then": {
               "en": "Cars allowed",
               "de": "Autos erlaubt",
-              "pa_PK": "موٹرکاراں دی اِجازت اے"
+              "pa_PK": "موٹرکاراں دی اِجازت اے",
+              "nl": "Auto's toegestaan"
             },
             "icon": {
               "path": "./assets/themes/cyclestreets/Zeichen_244_1024-10.svg",
@@ -599,7 +607,8 @@
             "if": "traffic_sign=DE:244.1",
             "then": {
               "en": "There are no supplementary signs at this bicycle road.",
-              "de": "An dieser Fahrradstraße gibt es keine zusätzlichen Schilder."
+              "de": "An dieser Fahrradstraße gibt es keine zusätzlichen Schilder.",
+              "nl": "Er zijn geen onderborden bij deze fietsstraat."
             },
             "icon": {
               "path": "./assets/themes/cyclestreets/Zeichen_244.svg",
diff --git a/assets/themes/healthcare/healthcare.json b/assets/themes/healthcare/healthcare.json
index 93d5e84ad..cbd3da3f3 100644
--- a/assets/themes/healthcare/healthcare.json
+++ b/assets/themes/healthcare/healthcare.json
@@ -30,4 +30,4 @@
     "hospital",
     "pharmacy"
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/indoors/indoors.json b/assets/themes/indoors/indoors.json
index 7c1944fe2..bb5086562 100644
--- a/assets/themes/indoors/indoors.json
+++ b/assets/themes/indoors/indoors.json
@@ -14,7 +14,8 @@
     "en": "On this map, publicly accessible indoor places are shown",
     "de": "Diese Karte zeigt öffentlich zugängliche Innenräume",
     "fr": "Cette carte présente les lieux intérieurs accessibles au public",
-    "da": "På dette kort er offentligt tilgængelige indendørs steder vist"
+    "da": "På dette kort er offentligt tilgængelige indendørs steder vist",
+    "nl": "Op deze kaart worden publiek toegankelijke binnenruimtes getoond"
   },
   "icon": "./assets/layers/entrance/entrance.svg",
   "startLat": 51.17181,
diff --git a/assets/themes/maproulette/maproulette.json b/assets/themes/maproulette/maproulette.json
index 7e1d79dbf..238412513 100644
--- a/assets/themes/maproulette/maproulette.json
+++ b/assets/themes/maproulette/maproulette.json
@@ -6,13 +6,15 @@
     "fr": "Tâches MapRoulette",
     "da": "KortRoulette-opgaver",
     "ca": "Tasques de MapRoulette",
-    "pa_PK": "میپ‌رولیٹ دے کم"
+    "pa_PK": "میپ‌رولیٹ دے کم",
+    "nl": "MapRoulette taken"
   },
   "description": {
     "en": "Theme showing MapRoulette tasks, allowing you to search, filter and fix them.",
     "de": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.",
     "fr": "Thème MapRoulette permettant d’afficher, rechercher, filtrer et résoudre les tâches.",
-    "da": "Tema, der viser MapRoulette-opgaver, så du kan søge, filtrere og rette dem."
+    "da": "Tema, der viser MapRoulette-opgaver, så du kan søge, filtrere og rette dem.",
+    "nl": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen."
   },
   "hideFromOverview": true,
   "icon": "./assets/layers/maproulette/logomark.svg",
diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index f95d12cba..d5fa4d346 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -327,7 +327,8 @@
             "da": "Statistikker",
             "nb_NO": "Statistikk",
             "ca": "Estadístiques",
-            "pa_PK": "انکڑے"
+            "pa_PK": "انکڑے",
+            "nl": "Statistieken"
           }
         },
         "tagRenderings": [
@@ -365,7 +366,8 @@
                   "da": "Importere",
                   "nb_NO": "Importer",
                   "ca": "Importar",
-                  "pa_PK": "ایمپورٹ کرو"
+                  "pa_PK": "ایمپورٹ کرو",
+                  "nl": "Importeren"
                 },
                 "icon": "./assets/svg/addSmall.svg",
                 "location_picker": "photo",
@@ -385,7 +387,8 @@
                   "de": "Alle vorgeschlagenen Tags hinzufügen",
                   "fr": "Ajouter tous les attributs suggérés",
                   "da": "Tilføj alle de foreslåede tags",
-                  "nb_NO": "Legg til alle foreslåtte"
+                  "nb_NO": "Legg til alle foreslåtte",
+                  "nl": "Voeg alle gesuggereerde tags toe"
                 },
                 "image": "./assets/svg/addSmall.svg",
                 "id_of_object_to_apply_this_one": "_closest_osm_hotel"
diff --git a/assets/themes/sidewalks/sidewalks.json b/assets/themes/sidewalks/sidewalks.json
index f6147619f..d8c700198 100644
--- a/assets/themes/sidewalks/sidewalks.json
+++ b/assets/themes/sidewalks/sidewalks.json
@@ -135,7 +135,8 @@
               "question": {
                 "en": "Is there a sidewalk on this side of the road?",
                 "de": "Gibt es auf dieser Straßenseite einen Bürgersteig?",
-                "da": "Er der et fortov på denne side af vejen?"
+                "da": "Er der et fortov på denne side af vejen?",
+                "nl": "Is er een stoep aan deze kant van de weg?"
               },
               "mappings": [
                 {
@@ -143,7 +144,8 @@
                   "then": {
                     "en": "Yes, there is a sidewalk on this side of the road",
                     "de": "Ja, es gibt einen Bürgersteig auf dieser Straßenseite",
-                    "da": "Ja, der er et fortov på denne side af vejen"
+                    "da": "Ja, der er et fortov på denne side af vejen",
+                    "nl": "Ja, er is een stoep aan deze kant van de weg"
                   }
                 },
                 {
@@ -151,7 +153,8 @@
                   "then": {
                     "en": "No, there is no sidewalk to walk on",
                     "de": "Nein, es gibt keinen Bürgersteig für Fußgänger",
-                    "da": "Nej, der er ikke noget fortov at gå på"
+                    "da": "Nej, der er ikke noget fortov at gå på",
+                    "nl": "Nee, er is geen stoep om op te lopen"
                   }
                 },
                 {
@@ -159,7 +162,8 @@
                   "then": {
                     "en": "There is a separately mapped sidewalk to walk on",
                     "de": "Es gibt einen separat kartierten Bürgersteig für Fußgänger",
-                    "da": "Der er et særskilt kortlagt fortov at gå på"
+                    "da": "Der er et særskilt kortlagt fortov at gå på",
+                    "nl": "Er is een apart ingetekende stoep om op te lopen"
                   }
                 }
               ]
@@ -169,12 +173,14 @@
               "question": {
                 "en": "What is the width of the sidewalk on this side of the road?",
                 "de": "Wie breit ist der Bürgersteig auf dieser Straßenseite?",
-                "da": "Hvad er bredden af fortovet på denne side af vejen?"
+                "da": "Hvad er bredden af fortovet på denne side af vejen?",
+                "nl": "Hoe breed is de stoep aan deze kant van de weg?"
               },
               "render": {
                 "en": "This sidewalk is {sidewalk:left|right:width}m wide",
                 "de": "Dieser Bürgersteig ist {sidewalk:left|right:width}m breit",
-                "da": "Dette fortov er {sidewalk:left|right:width}m bredt"
+                "da": "Dette fortov er {sidewalk:left|right:width}m bredt",
+                "nl": "Deze stoep is {sidewalk:left|right:width}m breed"
               },
               "condition": "sidewalk:left|right=yes",
               "freeform": {
diff --git a/assets/themes/sports/sports.json b/assets/themes/sports/sports.json
index c3e8e6908..f0fbc8bf1 100644
--- a/assets/themes/sports/sports.json
+++ b/assets/themes/sports/sports.json
@@ -62,4 +62,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/assets/themes/transit/transit.json b/assets/themes/transit/transit.json
index 93cbb0a72..207cf2ad4 100644
--- a/assets/themes/transit/transit.json
+++ b/assets/themes/transit/transit.json
@@ -7,13 +7,15 @@
     "da": "Busruter",
     "nb_NO": "Bussruter",
     "ca": "Rutes de bus",
-    "pa_PK": "بس روٹ"
+    "pa_PK": "بس روٹ",
+    "nl": "Busroutes"
   },
   "description": {
     "en": "Plan your trip with the help of the public transport system.",
     "de": "Planen Sie Ihre Reise mit Hilfe von öffentlichen Verkehrsmitteln.",
     "fr": "Planifier votre itinéraire avec le système de transports en commun.",
-    "da": "Planlæg din rejse ved hjælp af det offentlige transportsystem."
+    "da": "Planlæg din rejse ved hjælp af det offentlige transportsystem.",
+    "nl": "Plan je trip met behulp van het openbaar vervoer."
   },
   "icon": "./assets/layers/transit_stops/bus_stop.svg",
   "startZoom": 20,
diff --git a/assets/themes/walls_and_buildings/walls_and_buildings.json b/assets/themes/walls_and_buildings/walls_and_buildings.json
index ca91ff924..84c6d4d33 100644
--- a/assets/themes/walls_and_buildings/walls_and_buildings.json
+++ b/assets/themes/walls_and_buildings/walls_and_buildings.json
@@ -5,13 +5,15 @@
     "de": "Wände und Gebäude",
     "fr": "Murs et bâtiments",
     "da": "Mure og bygninger",
-    "nb_NO": "Murer og bygninger"
+    "nb_NO": "Murer og bygninger",
+    "nl": "Muren en gebouwen"
   },
   "description": {
     "en": "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.",
     "de": "Spezielle Ebene, die alle Wände und Gebäude bereitstellt. Diese Ebene ist nützlich in Voreinstellungen für Objekte, 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 umgeschaltet werden.",
     "fr": "Couche intégrée spéciale fournissant tous les murs et bâtiments. Cette couche est utile dans les préréglages pour les objets qui peuvent être placés contre les murs (par exemple, les DEA, les boîtes aux lettres, les entrées, les adresses, les caméras de surveillance, …). Ce calque est invisible par défaut et non inchangeable par l'utilisateur.",
-    "da": "Specielt indbygget lag giver alle vægge og bygninger. Dette lag er nyttigt i forudindstillinger til objekter, der kan placeres mod vægge (f.eks. AED'er, postkasser, indgange, adresser, overvågningskameraer, …). Dette lag er usynligt som standard og kan ikke skiftes af brugeren."
+    "da": "Specielt indbygget lag giver alle vægge og bygninger. Dette lag er nyttigt i forudindstillinger til objekter, der kan placeres mod vægge (f.eks. AED'er, postkasser, indgange, adresser, overvågningskameraer, …). Dette lag er usynligt som standard og kan ikke skiftes af brugeren.",
+    "nl": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker."
   },
   "icon": "./assets/layers/walls_and_buildings/walls_and_buildings.png",
   "startLat": 50.8465573,
diff --git a/assets/translators.json b/assets/translators.json
index 422ad3a80..eb4b139f3 100644
--- a/assets/translators.json
+++ b/assets/translators.json
@@ -1,11 +1,11 @@
 {
   "contributors": [
     {
-      "commits": 211,
+      "commits": 213,
       "contributor": "Pieter Vander Vennet"
     },
     {
-      "commits": 186,
+      "commits": 190,
       "contributor": "kjon"
     },
     {
@@ -18,11 +18,11 @@
     },
     {
       "commits": 45,
-      "contributor": "Anonymous"
+      "contributor": "Robin van der Linde"
     },
     {
-      "commits": 39,
-      "contributor": "Robin van der Linde"
+      "commits": 45,
+      "contributor": "Anonymous"
     },
     {
       "commits": 36,
@@ -256,6 +256,10 @@
       "commits": 3,
       "contributor": "SiegbjornSitumeang"
     },
+    {
+      "commits": 2,
+      "contributor": "mcliquid"
+    },
     {
       "commits": 2,
       "contributor": "Tarcila Cataldi"
@@ -324,6 +328,10 @@
       "commits": 2,
       "contributor": "Leo Alcaraz"
     },
+    {
+      "commits": 1,
+      "contributor": "Lucas"
+    },
     {
       "commits": 1,
       "contributor": "Magnitudee"
diff --git a/langs/fr.json b/langs/fr.json
index 59a7beca9..32921201b 100644
--- a/langs/fr.json
+++ b/langs/fr.json
@@ -39,6 +39,13 @@
         "panelIntro": "<h3>Votre thème personnel</h3>Activer vos couches favorites depuis les thèmes officiels",
         "reload": "Recharger les données"
     },
+    "flyer": {
+        "description": "Un flyer format A4 paysage pour promouvoir MapComplete",
+        "fakeui": {
+            "edit": "Une info fausse ou pas à jour ? Le bouton de modification est juste ici"
+        },
+        "title": "MapComplete.osm.be"
+    },
     "general": {
         "about": "Éditer facilement et ajouter OpenStreetMap pour un certain thème",
         "aboutMapcomplete": "<h3>À propos de MapComplete</h3><p>Avec MapComplete vous pouvez enrichir OpenStreetMap d'informations sur un <b>thème unique.</b> Répondez à quelques questions, et en quelques minutes vos contributions seront disponibles dans le monde entier ! Le <b>concepteur du thème</b> définis les éléments, questions et langues pour le thème.</p><h3>En savoir plus</h3><p>MapComplete <b>propose toujours l'étape suivante</b> pour en apprendre plus sur OpenStreetMap.</p><ul><li>Lorsqu'il est intégré dans un site Web, l'<i>iframe</i> pointe vers MapComplete en plein écran</li><li>La version plein écran donne des informations sur OpenStreetMap</li><li>Il est possible de regarder sans se connecter, mais l'édition demande une connexion à OSM.</li><li>Si vous n'êtes pas connecté, il vous est demandé de le faire</li><li>Une fois que vous avez répondu à une seule question, vous pouvez ajouter de nouveaux points à la carte</li><li>Au bout d'un moment, les vrais tags OSM sont montrés, qui pointent ensuite vers le wiki</li></ul><p></p><br><p>Vous avez remarqué <b>un problème</b> ? Vous souhaitez <b>demander une fonctionnalité</b> ? Vous voulez <b>aider à traduire</b> ? Allez voir <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">le code source</a> ou le <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\"><i>gestionnaire de tickets</i></a>.</p><p> Vous voulez visualiser <b>votre progression</b> ? Suivez le compteur d'édition sur <a href=\"{osmcha_link}\" target=\"_blank\">OsmCha</a>.</p>",
@@ -160,6 +167,7 @@
         },
         "nameInlineQuestion": "Le nom de cet/cette {category} est $$$",
         "next": "Suivant",
+        "noMatchingMapping": "Aucun résultat ne correspond à votre recherche…",
         "noNameCategory": "{category} sans nom",
         "noTagsSelected": "Aucune balise sélectionnée",
         "notValid": "Sélectionnez une valeur valide pour continuer",
@@ -234,6 +242,16 @@
         "skip": "Passer la question",
         "skippedQuestions": "Questions passées",
         "testing": "Test - les changements ne seront pas sauvegardés",
+        "uploadGpx": {
+            "modes": {
+                "private": {
+                    "name": "Anonyme"
+                },
+                "public": {
+                    "name": "Publique"
+                }
+            }
+        },
         "weekdays": {
             "abbreviations": {
                 "friday": "Ven",
@@ -269,18 +287,7 @@
             "searchToShort": "Votre requête est trop courte, entrez un texte plus long.",
             "searchWikidata": "Rechercher sur Wikidata",
             "wikipediaboxTitle": "Wikipédia"
-        },
-        "uploadGpx": {
-            "modes": {
-                "private": {
-                    "name": "Anonyme"
-                },
-                "public": {
-                    "name": "Publique"
-                }
-            }
-        },
-        "noMatchingMapping": "Aucun résultat ne correspond à votre recherche…"
+        }
     },
     "image": {
         "addPicture": "Ajoutez une photo",
@@ -292,17 +299,17 @@
         "dontDelete": "Annuler",
         "isDeleted": "Supprimé",
         "nearbyPictures": {
+            "allFiltered": "Aucune image ne correspond à votre filtre",
             "browseNearby": "Parcourir les images à proximité…",
+            "confirm": "L'image sélectionnée représente {title()}",
+            "hasMatchingPicture": "Est-ce qu'une image correspond à cet objet ? Sélectionnez ci-dessous",
             "loadMore": "Charger plus d'images",
+            "loading": "Chargement des images alentours…",
+            "noImageSelected": "Sélectionnez une image à lier à l'objet",
+            "nothingFound": "Aucune image trouvée à proximité…",
             "removeFilters": "Cliquez ici pour retirer les filtres",
             "title": "Images à proximité",
-            "withinRadius": "N'afficher que les images prises dans un rayon de {radius} mètres autour de cet objet",
-            "loading": "Chargement des images alentours…",
-            "confirm": "L'image sélectionnée représente {title()}",
-            "allFiltered": "Aucune image ne correspond à votre filtre",
-            "hasMatchingPicture": "Est-ce qu'une image correspond à cet objet ? Sélectionnez ci-dessous",
-            "noImageSelected": "Sélectionnez une image à lier à l'objet",
-            "nothingFound": "Aucune image trouvée à proximité…"
+            "withinRadius": "N'afficher que les images prises dans un rayon de {radius} mètres autour de cet objet"
         },
         "pleaseLogin": "Connectez-vous pour téléverser une photo",
         "respectPrivacy": "Ne photographiez ni les personnes ni les plaques d'immatriculation. Ne téléversez rien issu de Google Maps, Google Streetview ou d'autre sources soumises à des droits d'auteurs.",
@@ -316,9 +323,9 @@
     },
     "importHelper": {
         "askMetadata": {
-            "shouldBeUrl": "URL invalide",
+            "giveDescription": "Merci d'écrire une petite description pour la personne qui lira la note. Une bonne note décrit ce que le contributeur devra faire, par ex. <i>Il pourrait y avoir un banc ici. Si vous êtes dans le coin, pouvez-vous vérifier et indiquer si le banc est présent ou non ?</i> (Un lien vers MapComplete sera ajouté automatiquement)",
             "intro": "Avant d'ajouter {count} notes, merci de fournir quelques informations supplémentaires.",
-            "giveDescription": "Merci d'écrire une petite description pour la personne qui lira la note. Une bonne note décrit ce que le contributeur devra faire, par ex. <i>Il pourrait y avoir un banc ici. Si vous êtes dans le coin, pouvez-vous vérifier et indiquer si le banc est présent ou non ?</i> (Un lien vers MapComplete sera ajouté automatiquement)"
+            "shouldBeUrl": "URL invalide"
         },
         "login": {
             "loginRequired": "Connectez-vous pour continuer",
@@ -336,6 +343,23 @@
         "pickTheme": "Choisissez un thème ci-dessous pour commencer.",
         "title": "Bienvenue sur MapComplete"
     },
+    "matrixbot": {
+        "commands": {
+            "dm": {
+                "failed": "Je n'ai pas pu exécuter <code>{cmd}</code> à cause de {message}"
+            },
+            "documentation": {
+                "file": {
+                    "plural": "fichiers",
+                    "singular": "fichier"
+                },
+                "theme": {
+                    "plural": "thèmes",
+                    "singular": "thème"
+                }
+            }
+        }
+    },
     "move": {
         "cancel": "Annuler le déplacement",
         "cannotBeMoved": "Cet élément ne peut être déplacé.",
@@ -364,6 +388,31 @@
     "multi_apply": {
         "autoApply": "En changeant les attributs {attr_names}, ceux-ci seront automatiquement changés sur {count} autres éléments"
     },
+    "notes": {
+        "reopenNote": "Rouvrir la note",
+        "reopenNoteAndComment": "Rouvrir la note et commenter",
+        "textNeeded": "Saisir un texte descriptif pour créer une note",
+        "warnAnonymous": "Vous n'êtes pas connecté. Nous ne pourrons pas vous contacter pour résoudre ce problème."
+    },
+    "plantDetection": {
+        "error": "Une erreur est survenue lors de la détection de l'espèce de l'arbre : {error}",
+        "howTo": {
+            "intro": "Pour de résultats optimaux,",
+            "li0": "prenez une photo montant l'arbre au centre avec un peu d'élément à l'arrière plan",
+            "li1": "prenez une photo montrant une feuille seule",
+            "li2": "prenez une photo montant l'écorce",
+            "li3": "prenez une photo des fleurs"
+        },
+        "loadingWikidata": "Chargement des infos sur {species}",
+        "matchPercentage": "Correspondance {match} %",
+        "overviewIntro": "L'IA de <a href='https://plantnet.org/' target='_blank'>PlantNet.org</a> pense que les images représentes les espèces ci-dessous.",
+        "seeInfo": "Voir plus d'informations sur les espèces"
+    },
+    "privacy": {
+        "geodataTitle": "Votre géolocalisation",
+        "miscCookiesTitle": "Autres cookies",
+        "trackingTitle": "Données statistiques"
+    },
     "professional": {
         "indexPage": {
             "button": "Découvrez nos offres",
@@ -399,35 +448,25 @@
         "isTranslator": "Mode traduction activé, votre pseudo correspond à celui d’une personne de l’équipe de traduction",
         "missing": "{count} segments non traduits"
     },
-    "notes": {
-        "reopenNote": "Rouvrir la note",
-        "textNeeded": "Saisir un texte descriptif pour créer une note",
-        "warnAnonymous": "Vous n'êtes pas connecté. Nous ne pourrons pas vous contacter pour résoudre ce problème.",
-        "reopenNoteAndComment": "Rouvrir la note et commenter"
-    },
     "validation": {
         "email": {
             "noAt": "Une adresse email doit contenir un @"
         },
-        "url": {
-            "feedback": "Ceci n'est pas une adresse web valide",
-            "description": "lien vers un site web"
+        "float": {
+            "description": "un nombre",
+            "feedback": "Ceci n'est pas un nombre"
         },
         "int": {
             "description": "un nombre entier"
         },
         "nat": {
-            "notANumber": "Entrez un nombre",
             "mustBePositive": "Ce nombre doit être positif",
-            "mustBeWhole": "Seuls les nombres entiers sont autorisés"
+            "mustBeWhole": "Seuls les nombres entiers sont autorisés",
+            "notANumber": "Entrez un nombre"
         },
         "opening_hours": {
             "description": "Horaires d'ouverture"
         },
-        "float": {
-            "description": "un nombre",
-            "feedback": "Ceci n'est pas un nombre"
-        },
         "pfloat": {
             "description": "un nombre positif"
         },
@@ -438,49 +477,10 @@
         "pnat": {
             "description": "un nombre entier, positif",
             "noZero": "Zéro n'est pas autorisé"
-        }
-    },
-    "matrixbot": {
-        "commands": {
-            "dm": {
-                "failed": "Je n'ai pas pu exécuter <code>{cmd}</code> à cause de {message}"
-            },
-            "documentation": {
-                "file": {
-                    "singular": "fichier",
-                    "plural": "fichiers"
-                },
-                "theme": {
-                    "plural": "thèmes",
-                    "singular": "thème"
-                }
-            }
-        }
-    },
-    "privacy": {
-        "geodataTitle": "Votre géolocalisation",
-        "miscCookiesTitle": "Autres cookies",
-        "trackingTitle": "Données statistiques"
-    },
-    "plantDetection": {
-        "seeInfo": "Voir plus d'informations sur les espèces",
-        "howTo": {
-            "li3": "prenez une photo des fleurs",
-            "li0": "prenez une photo montant l'arbre au centre avec un peu d'élément à l'arrière plan",
-            "li1": "prenez une photo montrant une feuille seule",
-            "li2": "prenez une photo montant l'écorce",
-            "intro": "Pour de résultats optimaux,"
         },
-        "loadingWikidata": "Chargement des infos sur {species}",
-        "matchPercentage": "Correspondance {match} %",
-        "overviewIntro": "L'IA de <a href='https://plantnet.org/' target='_blank'>PlantNet.org</a> pense que les images représentes les espèces ci-dessous.",
-        "error": "Une erreur est survenue lors de la détection de l'espèce de l'arbre : {error}"
-    },
-    "flyer": {
-        "fakeui": {
-            "edit": "Une info fausse ou pas à jour ? Le bouton de modification est juste ici"
-        },
-        "description": "Un flyer format A4 paysage pour promouvoir MapComplete",
-        "title": "MapComplete.osm.be"
+        "url": {
+            "description": "lien vers un site web",
+            "feedback": "Ceci n'est pas une adresse web valide"
+        }
     }
 }
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 45ae55af8..333490ee8 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -3274,21 +3274,21 @@
         }
     },
     "dentist": {
+        "description": "Diese Ebene zeigt Zahnarztpraxen",
+        "name": "Zahnarzt",
         "presets": {
             "0": {
                 "title": "eine Zahnarztpraxis"
             }
         },
-        "title": {
-            "render": "Arztpraxis {name}"
-        },
-        "description": "Diese Ebene zeigt Zahnarztpraxen",
-        "name": "Zahnarzt",
         "tagRenderings": {
             "name": {
-                "render": "Dieser Zahnarzt heißt {name}",
-                "question": "Wie lautet der Name dieses Zahnarztes?"
+                "question": "Wie lautet der Name dieses Zahnarztes?",
+                "render": "Dieser Zahnarzt heißt {name}"
             }
+        },
+        "title": {
+            "render": "Arztpraxis {name}"
         }
     },
     "direction": {
@@ -3296,6 +3296,7 @@
         "name": "Aufnahmewinkel der Kamera anzeigen"
     },
     "doctors": {
+        "description": "Diese Ebene zeigt Arztpraxen, Zahnärzte und andere Gesundheitseinrichtungen",
         "name": "Ärzte",
         "presets": {
             "0": {
@@ -3328,8 +3329,7 @@
         },
         "title": {
             "render": "Arztpraxis {name}"
-        },
-        "description": "Diese Ebene zeigt Arztpraxen, Zahnärzte und andere Gesundheitseinrichtungen"
+        }
     },
     "dogpark": {
         "name": "Hundeparks",
@@ -4135,6 +4135,20 @@
                 },
                 "question": "Wird in dieser Pommesbude pflanzliches oder tierisches Fett zum Frittieren verwendet?"
             },
+            "friture-organic": {
+                "mappings": {
+                    "0": {
+                        "then": "Biologische Snacks sind erhältlich"
+                    },
+                    "1": {
+                        "then": "Es sind keine biologischen Snacks erhältlich"
+                    },
+                    "2": {
+                        "then": "Nur biologische Snacks sind erhältlich"
+                    }
+                },
+                "question": "Bietet diese Pommesbude biologische Snacks an?"
+            },
             "friture-take-your-container": {
                 "mappings": {
                     "0": {
@@ -4194,20 +4208,6 @@
                 },
                 "question": "Werden hier halal Gerichte angeboten?"
             },
-            "friture-organic": {
-                "mappings": {
-                    "1": {
-                        "then": "Es sind keine biologischen Snacks erhältlich"
-                    },
-                    "2": {
-                        "then": "Nur biologische Snacks sind erhältlich"
-                    },
-                    "0": {
-                        "then": "Biologische Snacks sind erhältlich"
-                    }
-                },
-                "question": "Bietet diese Pommesbude biologische Snacks an?"
-            },
             "organic (no friture)": {
                 "mappings": {
                     "0": {
@@ -5623,21 +5623,21 @@
         }
     },
     "physiotherapist": {
+        "description": "Diese Ebene zeigt Physiotherapeuten",
+        "name": "Physiotherapeut",
         "presets": {
             "0": {
                 "title": "Praxis eines Physiotherapeuten"
             }
         },
-        "name": "Physiotherapeut",
-        "title": {
-            "render": "Physiotherapeut {name}"
-        },
-        "description": "Diese Ebene zeigt Physiotherapeuten",
         "tagRenderings": {
             "name": {
                 "question": "Wie heißt die Praxis des Physiotherapeuten?",
                 "render": "Die Praxis des Physiotherapeuten heißt {name}"
             }
+        },
+        "title": {
+            "render": "Physiotherapeut {name}"
         }
     },
     "picnic_table": {
@@ -6515,23 +6515,23 @@
                     "render": "Das ist ein {shop}"
                 }
             },
-            "shops-name": {
-                "question": "Wie ist der Name dieses Geschäfts?",
-                "render": "Der Name des Geschäfts lautet <i>{name}</i>"
-            },
             "organic": {
                 "mappings": {
+                    "0": {
+                        "then": "Dieses Geschäft bietet Bio-Produkte an"
+                    },
                     "1": {
                         "then": "Dieses Geschäft bietet ausschließlich Bio-Produkte an"
                     },
                     "2": {
                         "then": "Dieses Geschäft bietet keine Bioprodukte an"
-                    },
-                    "0": {
-                        "then": "Dieses Geschäft bietet Bio-Produkte an"
                     }
                 },
                 "question": "Bietet dieses Geschäft Bioprodukte an?"
+            },
+            "shops-name": {
+                "question": "Wie ist der Name dieses Geschäfts?",
+                "render": "Der Name des Geschäfts lautet <i>{name}</i>"
             }
         },
         "title": {
@@ -7445,11 +7445,6 @@
             "wheelchair-door-width": {
                 "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?",
                 "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit"
-            },
-            "opening_hours": {
-                "override": {
-                    "question": "Wann ist die Einrichtung, in der sich die Toilette befindet, geöffnet?"
-                }
             }
         },
         "title": {
@@ -8117,4 +8112,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/en.json b/langs/layers/en.json
index e173cb87b..48fb33f8c 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -8117,4 +8117,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 2708737ad..8f201d482 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -2445,6 +2445,7 @@
         },
         "title": {
             "mappings": {
+                "0": {},
                 "1": {
                     "then": "Klimsite <b>{name}</b>"
                 },
@@ -3994,18 +3995,18 @@
                 "question": "Heeft dit restaurant halal opties?"
             },
             "organic (no friture)": {
-                "question": "Biedt dit restaurant biologisch eten?",
                 "mappings": {
-                    "2": {
-                        "then": "Er zijn alleen biologische opties beschikbaar"
-                    },
                     "0": {
                         "then": "Er zijn geen biologische opties beschikbaar"
                     },
                     "1": {
                         "then": "Er is een biologisch menu"
+                    },
+                    "2": {
+                        "then": "Er zijn alleen biologische opties beschikbaar"
                     }
-                }
+                },
+                "question": "Biedt dit restaurant biologisch eten?"
             }
         },
         "title": {
@@ -6180,23 +6181,23 @@
                     "render": "Dit is een {shop}"
                 }
             },
-            "shops-name": {
-                "question": "Wat is de naam van deze winkel?",
-                "render": "Deze zaak heet <i>{name}</i>"
-            },
             "organic": {
                 "mappings": {
-                    "1": {
-                        "then": "Deze winkel biedt uitluitend biologische producten aan"
-                    },
                     "0": {
                         "then": "Deze winkel biedt biologische producten aan"
                     },
+                    "1": {
+                        "then": "Deze winkel biedt uitluitend biologische producten aan"
+                    },
                     "2": {
                         "then": "Deze winkel heeft geen biologische producten"
                     }
                 },
                 "question": "Biedt deze winkel biologische producten aan?"
+            },
+            "shops-name": {
+                "question": "Wat is de naam van deze winkel?",
+                "render": "Deze zaak heet <i>{name}</i>"
             }
         },
         "title": {
@@ -7243,20 +7244,19 @@
             },
             "shelter": {
                 "mappings": {
-                    "2": {
-                        "then": "Deze halte heeft een schuilplaats, die apart op de kaart staat"
+                    "0": {
+                        "then": "Deze halte heeft een schuilplaats"
                     },
                     "1": {
                         "then": "Deze halte heeft geen schuilplaats"
                     },
-                    "0": {
-                        "then": "Deze halte heeft een schuilplaats"
+                    "2": {
+                        "then": "Deze halte heeft een schuilplaats, die apart op de kaart staat"
                     }
                 },
                 "question": "Heeft deze halte een schuilplaats?"
             },
             "stop_name": {
-                "render": "Deze halte heet <b>{name}</b>",
                 "freeform": {
                     "placeholder": "Naam van de halte"
                 },
@@ -7265,7 +7265,8 @@
                         "then": "Deze halte heeft geen naam"
                     }
                 },
-                "question": "Wat is de naam van deze halte?"
+                "question": "Wat is de naam van deze halte?",
+                "render": "Deze halte heet <b>{name}</b>"
             }
         },
         "title": {
@@ -7755,4 +7756,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/nl.json b/langs/nl.json
index f3cdefae0..16f0d2b51 100644
--- a/langs/nl.json
+++ b/langs/nl.json
@@ -182,6 +182,10 @@
             "title": "Selecteer lagen",
             "zoomInToSeeThisLayer": "Vergroot de kaart om deze laag te zien"
         },
+        "levelSelection": {
+            "addNewOnLevel": "Is het nieuwe punt op verdieping {level}?",
+            "confirmLevel": "Ja, voeg {preset} toe op verdieping {level}"
+        },
         "loading": "Aan het laden…",
         "loadingTheme": "{theme} wordt geladen…",
         "loginFailed": "Het inloggen op OpenStreetMap is gefaald",
@@ -277,6 +281,17 @@
         "skip": "Sla deze vraag over",
         "skippedQuestions": "Enkele vragen werden overgeslaan",
         "testing": "Testmode - wijzigingen worden niet opgeslaan",
+        "uploadGpx": {
+            "confirm": "Bevestig upload",
+            "modes": {
+                "private": {
+                    "name": "Anoniem"
+                },
+                "public": {
+                    "name": "Publiek"
+                }
+            }
+        },
         "weekdays": {
             "abbreviations": {
                 "friday": "Vrij",
@@ -317,21 +332,6 @@
             "searchToShort": "Je zoekopdracht is te kort, vul een langere tekst in",
             "searchWikidata": "Zoek op Wikidata",
             "wikipediaboxTitle": "Wikipedia"
-        },
-        "levelSelection": {
-            "confirmLevel": "Ja, voeg {preset} toe op verdieping {level}",
-            "addNewOnLevel": "Is het nieuwe punt op verdieping {level}?"
-        },
-        "uploadGpx": {
-            "confirm": "Bevestig upload",
-            "modes": {
-                "private": {
-                    "name": "Anoniem"
-                },
-                "public": {
-                    "name": "Publiek"
-                }
-            }
         }
     },
     "image": {
@@ -735,6 +735,13 @@
         "typeText": "Typ eerst een commentaar om deze toe te voegen",
         "warnAnonymous": "Je bent niet aangemeld. We gaan je niet kunnen contacteren om deze kaartnota te verwerken."
     },
+    "plantDetection": {
+        "howTo": {
+            "intro": "Voor optimale resultaten,",
+            "li0": "neem een foto waar de boom in het midden staat zonder te veel achtergrond",
+            "li1": "neem een foto met een enkel blad"
+        }
+    },
     "privacy": {
         "editing": "Wanneer je een wijziging maakt, wordt deze wijziging opgeslaan op OpenStreetMap. Dit is zichtbaar voor iedereen. Een wijzigingenset gemaakt met MapComplete bevat de volgende data:\n<ul><li>De aanpassingen aan de data</li><li>Je gebruikersnaam</li><li>Wanneer deze wijziging werd gemaakt</li><li>Het thema dat je gebruikt om de wijziging te maken</li><li>De taal van de gebruikersinterface</li><li>Een indicatie hoe ver jij je van de gewijzigde objecten bevindt. Andere bijdragers kunnen deze informatie gebruiken om af te leiden of de wijziging gemaakt door lokaal te gaan kijken of door onderzoek vanop afstand</li></ul> Bekijk ook <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\" target=\"_blank\">de privacy-policy op OpenStreetMap.org</a> voor gedetailleerde info. We herinneren je eraan dat je een pseudoniem of fictieve naam kan gebruiken wanneer je je registreert.",
         "editingTitle": "Wanneer je wijzigingen maakt",
@@ -945,12 +952,5 @@
         "wikidata": {
             "description": "Een Wikidata-code"
         }
-    },
-    "plantDetection": {
-        "howTo": {
-            "li0": "neem een foto waar de boom in het midden staat zonder te veel achtergrond",
-            "li1": "neem een foto met een enkel blad",
-            "intro": "Voor optimale resultaten,"
-        }
     }
 }
diff --git a/langs/shared-questions/de.json b/langs/shared-questions/de.json
index 6e0ebd185..60bf084d3 100644
--- a/langs/shared-questions/de.json
+++ b/langs/shared-questions/de.json
@@ -115,6 +115,18 @@
                 }
             }
         },
+        "opening_hours_by_appointment": {
+            "override": {
+                "mappings": {
+                    "0": {
+                        "then": "Nur nach Vereinbarung"
+                    },
+                    "1": {
+                        "then": "Nur nach Vereinbarung"
+                    }
+                }
+            }
+        },
         "payment-options": {
             "mappings": {
                 "0": {
@@ -210,18 +222,6 @@
                 }
             },
             "question": "Wie lautet der zugehörige Wikipedia Artikel?"
-        },
-        "opening_hours_by_appointment": {
-            "override": {
-                "mappings": {
-                    "0": {
-                        "then": "Nur nach Vereinbarung"
-                    },
-                    "1": {
-                        "then": "Nur nach Vereinbarung"
-                    }
-                }
-            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 3ada9a44a..59a525650 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -741,6 +741,101 @@
         "description": "Eine Karte mit Bordsteinen und Überwegen.",
         "title": "Bordsteine und Überwege"
     },
+    "mapcomplete-changes": {
+        "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
+        "layers": {
+            "0": {
+                "description": "Zeigt alle MapComplete-Änderungen",
+                "filter": {
+                    "0": {
+                        "options": {
+                            "0": {
+                                "question": "Themename enthält {search}"
+                            }
+                        }
+                    },
+                    "1": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt vom Mitwirkenden {search}"
+                            }
+                        }
+                    },
+                    "2": {
+                        "options": {
+                            "0": {
+                                "question": "<b>Nicht</b> von Mitwirkendem {search}"
+                            }
+                        }
+                    },
+                    "3": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt vor {search}"
+                            }
+                        }
+                    },
+                    "4": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt nach {search}"
+                            }
+                        }
+                    },
+                    "5": {
+                        "options": {
+                            "0": {
+                                "question": "Benutzersprache (ISO-Code) {search}"
+                            }
+                        }
+                    },
+                    "6": {
+                        "options": {
+                            "0": {
+                                "question": "Erstellt mit host {search}"
+                            }
+                        }
+                    }
+                },
+                "name": "Zentrum der Änderungssätze",
+                "tagRenderings": {
+                    "contributor": {
+                        "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?",
+                        "render": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
+                    },
+                    "host": {
+                        "question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?",
+                        "render": "Geändert über <a href='{host}'>{host}</a>"
+                    },
+                    "locale": {
+                        "question": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?",
+                        "render": "Benutzergebietsschema ist {locale}"
+                    },
+                    "show_changeset_id": {
+                        "render": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
+                    },
+                    "theme-id": {
+                        "question": "Welches Thema wurde für diese Änderung verwendet?",
+                        "render": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
+                    }
+                },
+                "title": {
+                    "render": "Änderungssatz für {theme}"
+                }
+            },
+            "1": {
+                "override": {
+                    "tagRenderings": {
+                        "link_to_more": {
+                            "render": "Weitere Statistiken <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
+                        }
+                    }
+                }
+            }
+        },
+        "shortDescription": "Zeigt Änderungen, die von MapComplete vorgenommen wurden",
+        "title": "Mit MapComplete vorgenommene Änderungen"
+    },
     "maproulette": {
         "description": "Thema mit MapRoulette-Aufgaben, die Sie suchen, filtern und beheben können.",
         "title": "MapRoulette-Aufgaben"
@@ -1079,100 +1174,5 @@
         "description": "Auf dieser Karte findest Du Abfalleimer in Deiner Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, kannst du ihn selbst hinzufügen",
         "shortDescription": "Eine Karte mit Abfalleimern",
         "title": "Abfalleimer"
-    },
-    "mapcomplete-changes": {
-        "title": "Mit MapComplete vorgenommene Änderungen",
-        "layers": {
-            "0": {
-                "filter": {
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Themename enthält {search}"
-                            }
-                        }
-                    },
-                    "2": {
-                        "options": {
-                            "0": {
-                                "question": "<b>Nicht</b> von Mitwirkendem {search}"
-                            }
-                        }
-                    },
-                    "3": {
-                        "options": {
-                            "0": {
-                                "question": "Erstellt vor {search}"
-                            }
-                        }
-                    },
-                    "4": {
-                        "options": {
-                            "0": {
-                                "question": "Erstellt nach {search}"
-                            }
-                        }
-                    },
-                    "1": {
-                        "options": {
-                            "0": {
-                                "question": "Erstellt vom Mitwirkenden {search}"
-                            }
-                        }
-                    },
-                    "5": {
-                        "options": {
-                            "0": {
-                                "question": "Benutzersprache (ISO-Code) {search}"
-                            }
-                        }
-                    },
-                    "6": {
-                        "options": {
-                            "0": {
-                                "question": "Erstellt mit host {search}"
-                            }
-                        }
-                    }
-                },
-                "tagRenderings": {
-                    "theme-id": {
-                        "question": "Welches Thema wurde für diese Änderung verwendet?",
-                        "render": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
-                    },
-                    "host": {
-                        "question": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?",
-                        "render": "Geändert über <a href='{host}'>{host}</a>"
-                    },
-                    "locale": {
-                        "question": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?",
-                        "render": "Benutzergebietsschema ist {locale}"
-                    },
-                    "contributor": {
-                        "question": "Welcher Mitwirkende hat diese Änderung vorgenommen?",
-                        "render": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
-                    },
-                    "show_changeset_id": {
-                        "render": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
-                    }
-                },
-                "name": "Zentrum der Änderungssätze",
-                "title": {
-                    "render": "Änderungssatz für {theme}"
-                },
-                "description": "Zeigt alle MapComplete-Änderungen"
-            },
-            "1": {
-                "override": {
-                    "tagRenderings": {
-                        "link_to_more": {
-                            "render": "Weitere Statistiken <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
-                        }
-                    }
-                }
-            }
-        },
-        "description": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen",
-        "shortDescription": "Zeigt Änderungen, die von MapComplete vorgenommen wurden"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 697d9c24b..42c314884 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1175,4 +1175,4 @@
         "shortDescription": "A map with waste baskets",
         "title": "Waste Basket"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index c1d3e4423..0f459e896 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -9,8 +9,6 @@
     },
     "bag": {
         "description": "Dit thema helpt het importeren van BAG data",
-        "shortDescription": "BAG import helper tool",
-        "title": "BAG import helper",
         "layers": {
             "0": {
                 "tagRenderings": {
@@ -27,13 +25,21 @@
             "2": {
                 "description": "Gebouw uit de BAG",
                 "tagRenderings": {
+                    "Build year": {
+                        "mappings": {
+                            "0": {
+                                "then": "De bouw van dit gebouw is gestart in <b>{_bag_obj:start_date}</b>"
+                            }
+                        },
+                        "render": "Dit gebouw is gebouwd in <b>{_bag_obj:start_date}</b>"
+                    },
                     "Building type": {
-                        "render": "Het gebouwtype is <b>{_bag_obj:building}</b>",
                         "mappings": {
                             "0": {
                                 "then": "Het gebouwtype wordt <b>{_bag_obj:construction}</b>"
                             }
-                        }
+                        },
+                        "render": "Het gebouwtype is <b>{_bag_obj:building}</b>"
                     },
                     "Import button": {
                         "mappings": {
@@ -44,18 +50,12 @@
                     },
                     "Reference": {
                         "render": "De referentie in BAG is <b>{_bag_obj:ref:bag}</b>"
-                    },
-                    "Build year": {
-                        "mappings": {
-                            "0": {
-                                "then": "De bouw van dit gebouw is gestart in <b>{_bag_obj:start_date}</b>"
-                            }
-                        },
-                        "render": "Dit gebouw is gebouwd in <b>{_bag_obj:start_date}</b>"
                     }
                 }
             }
-        }
+        },
+        "shortDescription": "BAG import helper tool",
+        "title": "BAG import helper"
     },
     "benches": {
         "description": "Deze kaart toont alle zitbanken die zijn opgenomen in OpenStreetMap: individuele banken en banken bij bushaltes. Met een OpenStreetMap-account kan je informatie verbeteren en nieuwe zitbanken toevoegen.",
@@ -464,33 +464,35 @@
                         "0": {
                             "then": "Deze straat is een fietsstraat (en dus zone 30)"
                         },
+                        "1": {
+                            "then": "Deze straat is een fietsstraat"
+                        },
+                        "2": {
+                            "then": "Deze straat is een fietsstraat (snelheid van 30 km/h en voertuigen niet toegestaan) (bord wordt later gevraagd)"
+                        },
                         "3": {
                             "then": "Deze straat is een fietsstraat"
                         },
                         "4": {
                             "then": "Deze straat wordt binnenkort een fietsstraat"
                         },
-                        "6": {
-                            "then": "Deze straat is geen fietsstraat"
-                        },
-                        "2": {
-                            "then": "Deze straat is een fietsstraat (snelheid van 30 km/h en voertuigen niet toegestaan) (bord wordt later gevraagd)"
-                        },
-                        "1": {
-                            "then": "Deze straat is een fietsstraat"
-                        },
                         "5": {
                             "then": "Deze straat wordt binnenkort een fietsstraat"
+                        },
+                        "6": {
+                            "then": "Deze straat is geen fietsstraat"
                         }
                     },
                     "question": "Is de straat <b>{name}</b> een fietsstraat?"
                 },
-                "2": {
-                    "question": "Wanneer wordt deze straat een fietsstraat?",
-                    "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}"
-                },
                 "1": {
                     "mappings": {
+                        "0": {
+                            "then": "Aanwonenden toegestaan"
+                        },
+                        "1": {
+                            "then": "Motorvoertuigen toegestaan"
+                        },
                         "2": {
                             "then": "Motoren toegestaan"
                         },
@@ -499,15 +501,13 @@
                         },
                         "4": {
                             "then": "Er zijn geen onderborden bij deze fietsstraat."
-                        },
-                        "0": {
-                            "then": "Aanwonenden toegestaan"
-                        },
-                        "1": {
-                            "then": "Motorvoertuigen toegestaan"
                         }
                     },
                     "question": "Welk bord heeft deze fietsstraat?"
+                },
+                "2": {
+                    "question": "Wanneer wordt deze straat een fietsstraat?",
+                    "render": "Deze straat wordt fietsstraat op {cyclestreet:start_date}"
                 }
             }
         },
@@ -868,13 +868,105 @@
         "title": "Hotels"
     },
     "indoors": {
-        "title": "Binnenruimtes",
-        "description": "Op deze kaart worden publiek toegankelijke binnenruimtes getoond"
+        "description": "Op deze kaart worden publiek toegankelijke binnenruimtes getoond",
+        "title": "Binnenruimtes"
     },
     "kerbs_and_crossings": {
         "description": "Een kaart met stoepranden en oversteekplaatsen.",
         "title": "Stoepranden en oversteekplaatsen"
     },
+    "mapcomplete-changes": {
+        "description": "Deze kaart toont alle wijzigingen gemaakt met MapComplete",
+        "layers": {
+            "0": {
+                "description": "Toon alle MapComplete wijzigingen",
+                "filter": {
+                    "0": {
+                        "options": {
+                            "0": {
+                                "question": "Themanaam bevat {search}"
+                            }
+                        }
+                    },
+                    "1": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt door {search}"
+                            }
+                        }
+                    },
+                    "2": {
+                        "options": {
+                            "0": {
+                                "question": "<b>Niet</b> gemaakt door {search}"
+                            }
+                        }
+                    },
+                    "3": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt voor {search}"
+                            }
+                        }
+                    },
+                    "4": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt na {search}"
+                            }
+                        }
+                    },
+                    "5": {
+                        "options": {
+                            "0": {
+                                "question": "Gebruikerstaal (iso-code) {search}"
+                            }
+                        }
+                    },
+                    "6": {
+                        "options": {
+                            "0": {
+                                "question": "Gemaakt met host {search}"
+                            }
+                        }
+                    }
+                },
+                "tagRenderings": {
+                    "contributor": {
+                        "render": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
+                    },
+                    "host": {
+                        "render": "Wijziging met <a href='{host}'>{host}</a>"
+                    },
+                    "show_changeset_id": {
+                        "render": "Wijzigingenset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
+                    },
+                    "theme-id": {
+                        "question": "Welk thema is gebruikt voor deze wijziging?",
+                        "render": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
+                    }
+                },
+                "title": {
+                    "render": "Changeset voor {theme}"
+                }
+            },
+            "1": {
+                "override": {
+                    "tagRenderings": {
+                        "link_to_more": {
+                            "render": "Meer statistieken zijn <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> te vinden"
+                        }
+                    }
+                }
+            }
+        },
+        "shortDescription": "Toont wijzigingen gemaakt met MapComplete",
+        "title": "Wijzigingen gemaakt met MapComplete"
+    },
+    "maproulette": {
+        "description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen.",
+        "title": "MapRoulette taken"
+    },
     "maps": {
         "description": "Op deze kaart kan je alle kaarten zien die OpenStreetMap kent.<br/><br/>Ontbreekt er een kaart, dan kan je die kaart hier ook gemakelijk aan deze kaart toevoegen.",
         "shortDescription": "Dit thema toont alle (toeristische) kaarten die OpenStreetMap kent",
@@ -939,6 +1031,13 @@
                     }
                 }
             },
+            "18": {
+                "override": {
+                    "=title": {
+                        "render": "Statistieken"
+                    }
+                }
+            },
             "19": {
                 "override": {
                     "+tagRenderings": {
@@ -958,13 +1057,6 @@
                         }
                     }
                 }
-            },
-            "18": {
-                "override": {
-                    "=title": {
-                        "render": "Statistieken"
-                    }
-                }
             }
         },
         "title": "OnWheels"
@@ -1066,21 +1158,18 @@
                 "description": "Laag die voetpaden naast wegen toont",
                 "name": "Voetpaden",
                 "tagRenderings": {
-                    "streetname": {
-                        "render": "Deze straat heet {name}"
-                    },
                     "left-right-questions": {
                         "renderings": {
                             "1": {
                                 "mappings": {
-                                    "2": {
-                                        "then": "Er is een apart ingetekende stoep om op te lopen"
+                                    "0": {
+                                        "then": "Ja, er is een stoep aan deze kant van de weg"
                                     },
                                     "1": {
                                         "then": "Nee, er is geen stoep om op te lopen"
                                     },
-                                    "0": {
-                                        "then": "Ja, er is een stoep aan deze kant van de weg"
+                                    "2": {
+                                        "then": "Er is een apart ingetekende stoep om op te lopen"
                                     }
                                 },
                                 "question": "Is er een stoep aan deze kant van de weg?"
@@ -1090,6 +1179,9 @@
                                 "render": "Deze stoep is {sidewalk:left|right:width}m breed"
                             }
                         }
+                    },
+                    "streetname": {
+                        "render": "Deze straat heet {name}"
                     }
                 },
                 "title": {
@@ -1232,11 +1324,19 @@
         "description": "Een kaart met openbare toiletten",
         "title": "Open Toilettenkaart"
     },
+    "transit": {
+        "description": "Plan je trip met behulp van het openbaar vervoer.",
+        "title": "Busroutes"
+    },
     "trees": {
         "description": "Breng bomen in kaart!",
         "shortDescription": "Breng bomen in kaart",
         "title": "Bomen"
     },
+    "walls_and_buildings": {
+        "description": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker.",
+        "title": "Muren en gebouwen"
+    },
     "waste": {
         "description": "Kaart met afvalbakken en recyclingfaciliteiten.",
         "title": "Afval"
@@ -1249,105 +1349,5 @@
         "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen",
         "shortDescription": "Een kaart met vuilnisbakken",
         "title": "Vuilnisbak"
-    },
-    "mapcomplete-changes": {
-        "description": "Deze kaart toont alle wijzigingen gemaakt met MapComplete",
-        "layers": {
-            "0": {
-                "description": "Toon alle MapComplete wijzigingen",
-                "title": {
-                    "render": "Changeset voor {theme}"
-                },
-                "tagRenderings": {
-                    "contributor": {
-                        "render": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
-                    },
-                    "theme-id": {
-                        "render": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
-                        "question": "Welk thema is gebruikt voor deze wijziging?"
-                    },
-                    "host": {
-                        "render": "Wijziging met <a href='{host}'>{host}</a>"
-                    },
-                    "show_changeset_id": {
-                        "render": "Wijzigingenset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
-                    }
-                },
-                "filter": {
-                    "4": {
-                        "options": {
-                            "0": {
-                                "question": "Gemaakt na {search}"
-                            }
-                        }
-                    },
-                    "3": {
-                        "options": {
-                            "0": {
-                                "question": "Gemaakt voor {search}"
-                            }
-                        }
-                    },
-                    "2": {
-                        "options": {
-                            "0": {
-                                "question": "<b>Niet</b> gemaakt door {search}"
-                            }
-                        }
-                    },
-                    "6": {
-                        "options": {
-                            "0": {
-                                "question": "Gemaakt met host {search}"
-                            }
-                        }
-                    },
-                    "1": {
-                        "options": {
-                            "0": {
-                                "question": "Gemaakt door {search}"
-                            }
-                        }
-                    },
-                    "0": {
-                        "options": {
-                            "0": {
-                                "question": "Themanaam bevat {search}"
-                            }
-                        }
-                    },
-                    "5": {
-                        "options": {
-                            "0": {
-                                "question": "Gebruikerstaal (iso-code) {search}"
-                            }
-                        }
-                    }
-                }
-            },
-            "1": {
-                "override": {
-                    "tagRenderings": {
-                        "link_to_more": {
-                            "render": "Meer statistieken zijn <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> te vinden"
-                        }
-                    }
-                }
-            }
-        },
-        "title": "Wijzigingen gemaakt met MapComplete",
-        "shortDescription": "Toont wijzigingen gemaakt met MapComplete"
-    },
-    "transit": {
-        "title": "Busroutes",
-        "description": "Plan je trip met behulp van het openbaar vervoer."
-    },
-    "walls_and_buildings": {
-        "title": "Muren en gebouwen",
-        "description": "Speciale ingebouwde laag voor alle muren en gebouwen. Deze laag is nuttig in voorkeuzen voor objecten die tegen muren geplaatst kunnen worden (bv. AEDs, brievenbussen, ingangen, adressen, beveiligingscamera's,…). Deze laag is standaard onzichtbaar en niet in te schakelen door de gebruiker."
-    },
-    "maproulette": {
-        "title": "MapRoulette taken",
-        "description": "Thema met MapRoulette taken, waar je ze kunt zoeken, filteren en ze oplossen."
     }
-}
+}
\ No newline at end of file
diff --git a/scripts/generateDocs.ts b/scripts/generateDocs.ts
index daaf743ca..af789f3b5 100644
--- a/scripts/generateDocs.ts
+++ b/scripts/generateDocs.ts
@@ -130,9 +130,14 @@ AllKnownLayouts.GenOverviewsForSingleLayer((layer, element, inlineSource) => {
     WriteFile("./Docs/Layers/" + layer.id + ".md", element, [source], { noTableOfContents: true })
 })
 
-Array.from(AllKnownLayouts.allKnownLayouts.values()).map(theme => {
-const docs = AllKnownLayouts.GenerateDocumentationForTheme(theme)
-    WriteFile("./Docs/Themes/" + theme.id + ".md", docs, [`assets/themes/${theme.id}/${theme.id}.json`], { noTableOfContents: true })
+Array.from(AllKnownLayouts.allKnownLayouts.values()).map((theme) => {
+    const docs = AllKnownLayouts.GenerateDocumentationForTheme(theme)
+    WriteFile(
+        "./Docs/Themes/" + theme.id + ".md",
+        docs,
+        [`assets/themes/${theme.id}/${theme.id}.json`],
+        { noTableOfContents: true }
+    )
 })
 WriteFile("./Docs/SpecialRenderings.md", SpecialVisualizations.HelpMessage(), [
     "UI/SpecialVisualizations.ts",

From 809c0a1ddf72c5d421dd8179fcf6da76ab087bbc Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Thu, 8 Dec 2022 03:01:08 +0100
Subject: [PATCH 18/18] Formatting

---
 Logic/FeatureSource/Sources/FilteringFeatureSource.ts | 2 +-
 Models/ThemeConfig/TagRenderingConfig.ts              | 2 +-
 UI/ImportFlow/ImportViewerGui.ts                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Logic/FeatureSource/Sources/FilteringFeatureSource.ts b/Logic/FeatureSource/Sources/FilteringFeatureSource.ts
index bfac081dc..e6f1999b4 100644
--- a/Logic/FeatureSource/Sources/FilteringFeatureSource.ts
+++ b/Logic/FeatureSource/Sources/FilteringFeatureSource.ts
@@ -98,7 +98,7 @@ export default class FilteringFeatureSource implements FeatureSourceForLayer, Ti
                 }
             }
 
-            for (const filter of (globalFilters ?? [])) {
+            for (const filter of globalFilters ?? []) {
                 const neededTags: TagsFilter = filter?.currentFilter
                 if (
                     neededTags !== undefined &&
diff --git a/Models/ThemeConfig/TagRenderingConfig.ts b/Models/ThemeConfig/TagRenderingConfig.ts
index 4abc9367c..2bb247a30 100644
--- a/Models/ThemeConfig/TagRenderingConfig.ts
+++ b/Models/ThemeConfig/TagRenderingConfig.ts
@@ -685,7 +685,7 @@ export default class TagRenderingConfig {
         if (this.condition !== undefined && !this.condition?.matchesProperties({})) {
             condition = new Combine([
                 "This tagrendering is only visible in the popup if the following condition is met:",
-                new FixedUiElement(this.condition.asHumanString(false, false, {})).SetClass("code")
+                new FixedUiElement(this.condition.asHumanString(false, false, {})).SetClass("code"),
             ])
         }
 
diff --git a/UI/ImportFlow/ImportViewerGui.ts b/UI/ImportFlow/ImportViewerGui.ts
index 6010ab587..0b7e75e44 100644
--- a/UI/ImportFlow/ImportViewerGui.ts
+++ b/UI/ImportFlow/ImportViewerGui.ts
@@ -441,8 +441,8 @@ class ImportInspector extends VariableUiElement {
                 }
                 // We only care about the properties here
                 let props: NoteProperties[] = notes["success"].features.map((f) => f.properties)
-                if(userDetails["uid"]){
-                    props = props.filter(n => n.comments[0].uid === userDetails["uid"])
+                if (userDetails["uid"]) {
+                    props = props.filter((n) => n.comments[0].uid === userDetails["uid"])
                 }
                 const perBatch: NoteState[][] = Array.from(
                     ImportInspector.SplitNotesIntoBatches(props).values()