Merge upstream

2022-12-16 13:40:25 +01:00 · 2022-12-16 13:40:25 +01:00 · 0bd28b996c
commit 0bd28b996c
parent 87b7bd9bc2
124 changed files with 2643 additions and 1009 deletions
--- 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 List(
-                new Link(l.id, "../Layers/"+l.id+".md"))),
+                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")
    }
--- 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 
--- 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)
--- 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 
--- 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`
--- 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)
--- 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)
--- 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` 
--- 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`
--- 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)
--- 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)
--- 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`
--- 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`
--- 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`
--- 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`
--- 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~.+`
--- 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~.+`
--- 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`
--- 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`
--- 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`
--- 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~.+`
--- 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)
--- 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)
--- 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)
--- 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`
--- a/Docs/Layers/dentist.md
+++ 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)
--- 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 
@ -191,6 +198,4 @@ This is rendered with  This doctor is specialized in {healthcare:speciality}
  - 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)
--- 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`
--- 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`
--- 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)
--- 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`
--- 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)
--- 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)
--- 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`
--- 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`
--- 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`
--- 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)
--- 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)
--- 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)
--- 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`
--- 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`
--- 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)
--- 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)
--- 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)
--- 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`
--- 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`
--- 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)
--- 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)
--- 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)
--- a/Docs/Layers/physiotherapist.md
+++ 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)
--- 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`
--- 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~.+`
--- 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`
--- 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)
--- 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`
--- 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~.+`
--- 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`
--- 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)
--- 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~.+`
--- 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)
--- a/Docs/Layers/sport_shops.md
+++ b/Docs/Layers/sport_shops.md
--- 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`
--- 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)
--- 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)
--- 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`
--- 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`
--- 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`
--- 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`
--- 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`
--- 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)
--- 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)
--- 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)
--- 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)
--- 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')",
--- 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')",
--- 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"
    }
  ]
--- 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",
--- 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')"
--- 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",
+      "description": "The MapComplete theme Personal theme has a layer Dentist showing features with this tag",
-      "value": "doctors"
+      "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"
+      "value": "doctors"
    },
    {
      "key": "healthcare",
      "description": "The MapComplete theme Personal theme has a layer Doctors showing features with this tag",
      "value": "physiotherapist"
    },
    {
      "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",
--- 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",
--- 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"
    }
  ]
--- 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"
    }
  ]
 }
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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"
--- 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": {
--- 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"
          }
        },
        {
--- a/assets/layers/dentist/dentist.json
+++ b/assets/layers/dentist/dentist.json
@ -2,10 +2,12 @@
  "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"
@ -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"
--- 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"
  },
  "title": {
    "render": {
@ -24,7 +24,6 @@
  },
  "minzoom": 13,
  "tagRenderings": [
    "images",
    {
      "question": {
--- 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"
          }
        }
      ]
--- 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"
          }
        }
      ],
--- 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": "اندروں"
--- a/assets/layers/pharmacy/pharmacy.json
+++ b/assets/layers/pharmacy/pharmacy.json
@ -1,9 +1,9 @@
 {
  "id": "pharmacy",
  "name": {
-    "en": "pharmacy",
+    "en": "Pharmacies",
-    "de": "Apotheke",
+    "de": "Apotheken",
-    "nl": "apotheek",
+    "nl": "Apotheken",
    "pa_PK": "فارمیسی"
  },
  "description": {
--- 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": [
    {
--- 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"
          }
        }
      ],
--- a/Show more
+++ b/Show more
`@ -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)`	`This document is autogenerated from [assets/layers/artwork/artwork.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/artwork/artwork.json)`
`@ -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)`	`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)`
`@ -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`
`@ -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`
`@ -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~.+`
`@ -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)`	`This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)`
`@ -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)`	`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)`
`@ -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`
`@ -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`
`@ -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)`	`This document is autogenerated from [assets/layers/maproulette/maproulette.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/maproulette/maproulette.json)`