From 4014c57754e0d953570484ddc5f97db14555f941 Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Wed, 30 Nov 2022 20:05:19 +0000
Subject: [PATCH 01/23] Translated using Weblate (German)

Currently translated at 100.0% (2475 of 2475 strings)

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

diff --git a/langs/layers/de.json b/langs/layers/de.json
index 68bbb842a3..b9dbd12885 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -7366,6 +7366,11 @@
             "wheelchair-door-width": {
                 "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?",
                 "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit"
+            },
+            "opening_hours": {
+                "override": {
+                    "question": "Wann ist die Einrichtung, in der sich die Toilette befindet, geöffnet?"
+                }
             }
         },
         "title": {
@@ -8033,4 +8038,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

From 62b6d26493bf7efa0e842d86cb176b6b5ca92661 Mon Sep 17 00:00:00 2001
From: Vinicius <rodriguessv30@gmail.com>
Date: Fri, 2 Dec 2022 05:31:09 +0000
Subject: [PATCH 02/23] Translated using Weblate (Portuguese (Brazil))

Currently translated at 16.8% (126 of 748 strings)

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

diff --git a/langs/pt_BR.json b/langs/pt_BR.json
index 901989fbec..919a0ff117 100644
--- a/langs/pt_BR.json
+++ b/langs/pt_BR.json
@@ -14,7 +14,8 @@
             "retagNoOtherThemes": "Este recurso será reclassificado e ocultado deste aplicativo",
             "retagOtherThemes": "Este recurso será remarcado e ficará visível em {otherThemes}",
             "selectReason": "Por favor, selecione por que este recurso deve ser excluído"
-        }
+        },
+        "isDeleted": "Este recurso foi excluído"
     },
     "favourite": {
         "loginNeeded": "<h3>Entrar</h3> Um layout pessoal está disponível apenas para usuários do OpenStreetMap",

From c20dbb7a265081c8218daddab59849320394ab5c Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 5 Dec 2022 15:48:46 +0100
Subject: [PATCH 03/23] Housekeeping...

---
 assets/contributors.json | 2 +-
 assets/translators.json  | 8 ++++----
 langs/layers/de.json     | 7 +------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/assets/contributors.json b/assets/contributors.json
index 3fb83a3733..2499ad139a 100644
--- a/assets/contributors.json
+++ b/assets/contributors.json
@@ -1,7 +1,7 @@
 {
   "contributors": [
     {
-      "commits": 4658,
+      "commits": 4661,
       "contributor": "Pieter Vander Vennet"
     },
     {
diff --git a/assets/translators.json b/assets/translators.json
index ce7b08256f..422ad3a802 100644
--- a/assets/translators.json
+++ b/assets/translators.json
@@ -5,7 +5,7 @@
       "contributor": "Pieter Vander Vennet"
     },
     {
-      "commits": 185,
+      "commits": 186,
       "contributor": "kjon"
     },
     {
@@ -109,12 +109,12 @@
       "contributor": "Jacque Fresco"
     },
     {
-      "commits": 7,
-      "contributor": "快乐的老鼠宝宝"
+      "commits": 8,
+      "contributor": "Vinicius"
     },
     {
       "commits": 7,
-      "contributor": "Vinicius"
+      "contributor": "快乐的老鼠宝宝"
     },
     {
       "commits": 7,
diff --git a/langs/layers/de.json b/langs/layers/de.json
index b9dbd12885..68bbb842a3 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -7366,11 +7366,6 @@
             "wheelchair-door-width": {
                 "question": "Wie breit ist die Tür zur rollstuhlgerechten Toilette?",
                 "render": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(toilets:door:width)} breit"
-            },
-            "opening_hours": {
-                "override": {
-                    "question": "Wann ist die Einrichtung, in der sich die Toilette befindet, geöffnet?"
-                }
             }
         },
         "title": {
@@ -8038,4 +8033,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

From 0e4fad5f3c21f9569a128b0fd818733fe6b39fd2 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 5 Dec 2022 15:51:41 +0100
Subject: [PATCH 04/23] Override id of 'sport_shops' to prevent cache
 contamination

---
 assets/themes/sports/sports.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assets/themes/sports/sports.json b/assets/themes/sports/sports.json
index e85bda780b..c3e8e6908e 100644
--- a/assets/themes/sports/sports.json
+++ b/assets/themes/sports/sports.json
@@ -28,6 +28,7 @@
     {
       "builtin": "shops",
       "override": {
+        "id": "sport_shops",
         "source": {
           "osmTags": {
             "and": [
@@ -61,4 +62,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}

From a28b610bbf4cf8981b969ab483e8bfd1bc6431a0 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 5 Dec 2022 23:14:07 +0100
Subject: [PATCH 05/23] Split doctors-layer into 'doctors', 'physiotherapist'
 and 'dentist' layers

---
 Models/ThemeConfig/TagRenderingConfig.ts      |  5 +-
 assets/layers/dentist/dentist.json            | 71 ++++++++++++++++++
 .../layers/{doctors => dentist}/dentist.svg   |  0
 assets/layers/dentist/license_info.json       | 12 +++
 assets/layers/doctors/doctors.json            | 68 ++++-------------
 assets/layers/doctors/license_info.json       | 10 ---
 assets/layers/physiotherapist/doctors.svg     | 20 +++++
 .../layers/physiotherapist/license_info.json  | 12 +++
 .../physiotherapist/physiotherapist.json      | 73 +++++++++++++++++++
 assets/tagRenderings/questions.json           | 22 +++++-
 assets/themes/healthcare/healthcare.json      |  6 +-
 .../mapcomplete-changes.json                  | 72 ++++++------------
 12 files changed, 251 insertions(+), 120 deletions(-)
 create mode 100644 assets/layers/dentist/dentist.json
 rename assets/layers/{doctors => dentist}/dentist.svg (100%)
 create mode 100644 assets/layers/dentist/license_info.json
 create mode 100644 assets/layers/physiotherapist/doctors.svg
 create mode 100644 assets/layers/physiotherapist/license_info.json
 create mode 100644 assets/layers/physiotherapist/physiotherapist.json

diff --git a/Models/ThemeConfig/TagRenderingConfig.ts b/Models/ThemeConfig/TagRenderingConfig.ts
index 38dba39c35..4abc9367ca 100644
--- a/Models/ThemeConfig/TagRenderingConfig.ts
+++ b/Models/ThemeConfig/TagRenderingConfig.ts
@@ -684,9 +684,8 @@ export default class TagRenderingConfig {
         let condition: BaseUIElement = undefined
         if (this.condition !== undefined && !this.condition?.matchesProperties({})) {
             condition = new Combine([
-                "Only visible if ",
-                new FixedUiElement(this.condition.asHumanString(false, false, {})).SetClass("code"),
-                " is shown",
+                "This tagrendering is only visible in the popup if the following condition is met:",
+                new FixedUiElement(this.condition.asHumanString(false, false, {})).SetClass("code")
             ])
         }
 
diff --git a/assets/layers/dentist/dentist.json b/assets/layers/dentist/dentist.json
new file mode 100644
index 0000000000..6c89b6de7b
--- /dev/null
+++ b/assets/layers/dentist/dentist.json
@@ -0,0 +1,71 @@
+{
+  "id": "dentist",
+  "name": {
+    "en": "Dentist",
+    "nl": "Tandarts"
+  },
+  "description": {
+    "en": "This layer shows dentist offices"
+  },
+  "source": {
+    "osmTags":      "amenity=dentist"
+  },
+  "title": {
+    "render": {
+      "en": "Dentist Office {name}",
+      "de": "Arztpraxis {name}",
+      "nl": "Dokterspraktijk {name}",
+      "fr": "Cabinet medical {name}"
+    }
+  },
+  "minzoom": 13,
+  "tagRenderings": [
+    "images",
+    "opening_hours",
+    "phone",
+    "email",
+    "website",
+    {
+      "question": {
+        "en": "What is the name of this dentist?"
+      },
+      "render": {
+        "en": "This dentist is called {name}"
+      },
+      "freeform": {
+        "key": "name"
+      },
+      "id": "name"
+    }
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a dentists office",
+        "de": "eine Zahnarztpraxis",
+        "nl": "een tandartspraktijk",
+        "fr": "un cabinet de dentistes"
+      },
+      "tags": [
+        "amenity=dentist"
+      ]
+    }
+  ],
+  "filter": [
+    "open_now"
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "circle:white;./assets/layers/dentist/dentist.svg"
+      },
+      "iconSize": "40,40,center",
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "deletion": true,
+  "allowMove": true
+}
diff --git a/assets/layers/doctors/dentist.svg b/assets/layers/dentist/dentist.svg
similarity index 100%
rename from assets/layers/doctors/dentist.svg
rename to assets/layers/dentist/dentist.svg
diff --git a/assets/layers/dentist/license_info.json b/assets/layers/dentist/license_info.json
new file mode 100644
index 0000000000..a7a30a41b0
--- /dev/null
+++ b/assets/layers/dentist/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "dentist.svg",
+    "license": "CC0",
+    "authors": [
+      "OSM Carto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Dentist-14.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/doctors/doctors.json b/assets/layers/doctors/doctors.json
index afd2c36d6a..34b1b78b9c 100644
--- a/assets/layers/doctors/doctors.json
+++ b/assets/layers/doctors/doctors.json
@@ -8,19 +8,11 @@
     "pa_PK": "ڈاکٹر"
   },
   "description": {
-    "en": "This layer shows doctor offices, dentists and other healthcare facilities",
-    "de": "Diese Ebene zeigt Arztpraxen, Zahnärzte und andere Gesundheitseinrichtungen",
-    "nl": "Deze laag toont dokterspraktijken, tandartsen en andere gezondheidszorgfaciliteiten",
-    "fr": "Ce calque montre les cabinets médicaux, les dentistes et autres établissements de santé"
+    "en": "This layer shows doctor offices"
   },
   "source": {
-    "osmTags": {
-      "or": [
-        "amenity=doctors",
-        "amenity=dentist",
-        "healthcare=physiotherapist"
-      ]
-    }
+    "osmTags":         "amenity=doctors"
+    
   },
   "title": {
     "render": {
@@ -28,29 +20,12 @@
       "de": "Arztpraxis {name}",
       "nl": "Dokterspraktijk {name}",
       "fr": "Cabinet medical {name}"
-    },
-    "mappings": [
-      {
-        "if": "amenity=doctors",
-        "then": "Doctors Office {name}"
-      },
-      {
-        "if": "amenity=dentist",
-        "then": "Dentists office {name}"
-      },
-      {
-        "if": "healthcare=physiotherapist",
-        "then": "Physiotherapists office {name}"
-      }
-    ]
+    }
   },
   "minzoom": 13,
   "tagRenderings": [
+    
     "images",
-    "opening_hours",
-    "phone",
-    "email",
-    "website",
     {
       "question": {
         "en": "What is the name of this doctors place?",
@@ -69,8 +44,11 @@
       },
       "id": "name"
     },
+    "opening_hours_by_appointment",
+    "phone",
+    "email",
+    "website",
     {
-      "condition": "amenity=doctors",
       "id": "specialty",
       "render": {
         "en": "This doctor is specialized in {healthcare:speciality}",
@@ -87,6 +65,7 @@
       "freeform": {
         "key": "healthcare:speciality"
       },
+      "multiAnswer": true,
       "mappings": [
         {
           "if": "healthcare:speciality=general",
@@ -138,28 +117,6 @@
       "tags": [
         "amenity=doctors"
       ]
-    },
-    {
-      "title": {
-        "en": "a dentists office",
-        "de": "eine Zahnarztpraxis",
-        "nl": "een tandartspraktijk",
-        "fr": "un cabinet de dentistes"
-      },
-      "tags": [
-        "amenity=dentist"
-      ]
-    },
-    {
-      "title": {
-        "en": "a physiotherapists office",
-        "de": "Praxis eines Physiotherapeuten",
-        "nl": "een fysiotherapeutenpraktijk",
-        "fr": "un cabinet de kinésithérapeutes"
-      },
-      "tags": [
-        "healthcare=physiotherapist"
-      ]
     }
   ],
   "filter": [
@@ -177,5 +134,6 @@
       ]
     }
   ],
-  "deletion": true
-}
\ No newline at end of file
+  "deletion": true,
+  "allowMove": true
+}
diff --git a/assets/layers/doctors/license_info.json b/assets/layers/doctors/license_info.json
index cc0457d850..90889fdc6c 100644
--- a/assets/layers/doctors/license_info.json
+++ b/assets/layers/doctors/license_info.json
@@ -1,14 +1,4 @@
 [
-  {
-    "path": "dentist.svg",
-    "license": "CC0",
-    "authors": [
-      "OSM Carto"
-    ],
-    "sources": [
-      "https://wiki.openstreetmap.org/wiki/File:Dentist-14.svg"
-    ]
-  },
   {
     "path": "doctors.svg",
     "license": "cc0",
diff --git a/assets/layers/physiotherapist/doctors.svg b/assets/layers/physiotherapist/doctors.svg
new file mode 100644
index 0000000000..94516a6887
--- /dev/null
+++ b/assets/layers/physiotherapist/doctors.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="500"
+   height="500"
+   viewBox="0 0 14 14">
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,1 C 5.83929,1 4.667834,1.5047052 3.875,2.5 3.187514,3.3630449 3,4 2.90625,5.0000004 0.01009,5.0238004 0,6.0817104 0,13 l 14,0 C 14,6.0817104 13.9899,5.0237504 11.09375,5.0000004 11,4 10.795537,3.3460958 10.125,2.5 9.334655,1.5027279 8.16071,1 7,1 z M 7,3 C 8.281412,2.99511 9,4 9.0625,5.0000004 l -4.125,0 C 5,4 5.718588,3.0048937 7,3 z m -1,3.0000004 2,0 L 8,8 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"
+     id="doctor" style="fill:#BF0000" />
+</svg>
diff --git a/assets/layers/physiotherapist/license_info.json b/assets/layers/physiotherapist/license_info.json
new file mode 100644
index 0000000000..90889fdc6c
--- /dev/null
+++ b/assets/layers/physiotherapist/license_info.json
@@ -0,0 +1,12 @@
+[
+  {
+    "path": "doctors.svg",
+    "license": "cc0",
+    "authors": [
+      "osmcarto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Doctors-14.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/physiotherapist/physiotherapist.json b/assets/layers/physiotherapist/physiotherapist.json
new file mode 100644
index 0000000000..0f878b9858
--- /dev/null
+++ b/assets/layers/physiotherapist/physiotherapist.json
@@ -0,0 +1,73 @@
+{
+  "id": "physiotherapist",
+  "name": {
+    "en": "Physiotherapist",
+    "nl": "Kinesist"
+  },
+  "description": {
+    "en": "This layer shows physiotherapists",
+    "nl": "Deze laag toont kinesisten"
+  },
+  "source": {
+    "osmTags": "healthcare=physiotherapist"
+  },
+  "title": {
+    "render": {
+      "en": "Physiotherapist {name}",
+      "nl": "Kinesist {name}"
+    }
+  },
+  "minzoom": 13,
+  "tagRenderings": [
+    "images",
+    {
+      "question": {
+        "en": "What is the name of this physiotherapists office?",
+        "nl": "Wat is de naam van deze kinesistenpraktijk?"
+      },
+      "render": {
+        "en": "This physiotherapists office is called {name}",
+        "nl": "Deze kinesistenpraktijk heet {name}"
+      },
+      "freeform": {
+        "key": "name"
+      },
+      "id": "name"
+    },
+    "opening_hours_by_appointment",
+    "phone",
+    "email",
+    "website"
+
+  ],
+  "presets": [
+    {
+      "title": {
+        "en": "a physiotherapists office",
+        "de": "Praxis eines Physiotherapeuten",
+        "nl": "een fysiotherapeutenpraktijk",
+        "fr": "un cabinet de kinésithérapeutes"
+      },
+      "tags": [
+        "healthcare=physiotherapist"
+      ]
+    }
+  ],
+  "filter": [
+    "open_now"
+  ],
+  "mapRendering": [
+    {
+      "icon": {
+        "render": "circle:white;./assets/layers/physiotherapist/doctors.svg"
+      },
+      "iconSize": "40,40,center",
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ],
+  "deletion": true,
+  "allowMove": true
+}
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 4be1d7c88e..95a79226db 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -681,6 +681,26 @@
       ]
     }
   },
+  "opening_hours_by_appointment": {
+    "builtin": "opening_hours",
+    "override": {
+      "mappings": [
+        {
+          "if": "opening_hours=\"by appointment\"",
+          "then": {
+            "en": "Only by appointment"
+          }
+        },
+        {
+          "if": "opening_hours~i~\"by appointment\"|by appointment",
+          "then": {
+            "en": "Only by appointment"
+          },
+          "hideInAnswer": true
+        }
+      ]
+    }
+  },
   "service:electricity": {
     "#": "service:socket describes if a pub, restaurant or café offers electricity to their customers.",
     "question": {
@@ -1471,4 +1491,4 @@
       "es": "El nombre de red es <b>{internet_access:ssid}</b>"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/assets/themes/healthcare/healthcare.json b/assets/themes/healthcare/healthcare.json
index 208e816f1c..93d5e84adc 100644
--- a/assets/themes/healthcare/healthcare.json
+++ b/assets/themes/healthcare/healthcare.json
@@ -15,7 +15,7 @@
     "de": "Auf dieser Karte werden verschiedene Gesundheitseinrichtungen angezeigt",
     "fr": "Cette carte affiche différents éléments liés à la santé",
     "da": "På dette kort er forskellige sundhedsrelaterede emner vist",
-    "nl": "Op deze kaart vind je dokters en apothekers"
+    "nl": "Op deze kaart vind je dokters, apothekers, kinesisten, ziekenhuizen en andere gezondheidsgerelateerde diensten"
   },
   "icon": "./assets/layers/doctors/doctors.svg",
   "startLat": 50.8465573,
@@ -25,7 +25,9 @@
   "widenFactor": 2,
   "layers": [
     "doctors",
+    "physiotherapist",
+    "dentist",
     "hospital",
     "pharmacy"
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index fe37ee177c..d0726a92e2 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,16 +1,13 @@
 {
   "id": "mapcomplete-changes",
   "title": {
-    "en": "Changes made with MapComplete",
-    "de": "Mit MapComplete vorgenommene Änderungen"
+    "en": "Changes made with MapComplete"
   },
   "shortDescription": {
-    "en": "Shows changes made by MapComplete",
-    "de": "Zeigt Änderungen an, die von MapComplete vorgenommen wurden"
+    "en": "Shows changes made by MapComplete"
   },
   "description": {
-    "en": "This maps shows all the changes made with MapComplete",
-    "de": "Diese Karte zeigt alle mit MapComplete vorgenommenen Änderungen"
+    "en": "This maps shows all the changes made with MapComplete"
   },
   "icon": "./assets/svg/logo.svg",
   "hideFromOverview": true,
@@ -23,10 +20,7 @@
     {
       "id": "mapcomplete-changes",
       "name": {
-        "en": "Changeset centers",
-        "ca": "Centres del conjunt de canvis",
-        "de": "Zentrum der Änderungssätze",
-        "pa_PK": "تبدیلیاں دے کیندر"
+        "en": "Changeset centers"
       },
       "minzoom": 0,
       "source": {
@@ -37,48 +31,41 @@
       },
       "title": {
         "render": {
-          "en": "Changeset for {theme}",
-          "de": "Änderungssatz für {theme}"
+          "en": "Changeset for {theme}"
         }
       },
       "description": {
-        "en": "Shows all MapComplete changes",
-        "de": "Zeigt alle MapComplete-Änderungen"
+        "en": "Shows all MapComplete changes"
       },
       "tagRenderings": [
         {
           "id": "show_changeset_id",
           "render": {
-            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
-            "de": "Änderungssatz <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
+            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
           }
         },
         {
           "id": "contributor",
           "question": {
-            "en": "What contributor did make this change?",
-            "de": "Welcher Mitwirkende hat diese Änderung vorgenommen?"
+            "en": "What contributor did make this change?"
           },
           "freeform": {
             "key": "user"
           },
           "render": {
-            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>",
-            "de": "Änderung vorgenommen von <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
+            "en": "Change made by <a href='https://openstreetmap.org/user/{user}' target='_blank'>{user}</a>"
           }
         },
         {
           "id": "theme-id",
           "question": {
-            "en": "What theme was used to make this change?",
-            "de": "Welches Thema wurde für diese Änderung verwendet?"
+            "en": "What theme was used to make this change?"
           },
           "freeform": {
             "key": "theme"
           },
           "render": {
-            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
-            "de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
+            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
           }
         },
         {
@@ -87,23 +74,19 @@
             "key": "locale"
           },
           "question": {
-            "en": "What locale (language) was this change made in?",
-            "de": "In welchem Gebietsschema (Sprache) wurde diese Änderung vorgenommen?"
+            "en": "What locale (language) was this change made in?"
           },
           "render": {
-            "en": "User locale is {locale}",
-            "de": "Benutzergebietsschema ist {locale}"
+            "en": "User locale is {locale}"
           }
         },
         {
           "id": "host",
           "render": {
-            "en": "Change with with <a href='{host}'>{host}</a>",
-            "de": "Geändert über <a href='{host}'>{host}</a>"
+            "en": "Change with with <a href='{host}'>{host}</a>"
           },
           "question": {
-            "en": "What host (website) was this change made with?",
-            "de": "Über welchen Host (Webseite) wurde diese Änderung vorgenommen?"
+            "en": "What host (website) was this change made with?"
           },
           "freeform": {
             "key": "host"
@@ -436,9 +419,7 @@
                 }
               ],
               "question": {
-                "en": "Themename contains {search}",
-                "ca": "El nom de la petició conté {search}",
-                "de": "Themename enthält {search}"
+                "en": "Themename contains {search}"
               }
             }
           ]
@@ -454,8 +435,7 @@
                 }
               ],
               "question": {
-                "en": "Made by contributor {search}",
-                "de": "Erstellt vom Mitwirkenden {search}"
+                "en": "Made by contributor {search}"
               }
             }
           ]
@@ -471,8 +451,7 @@
                 }
               ],
               "question": {
-                "en": "<b>Not</b> made by contributor {search}",
-                "de": "<b>Nicht</b> von Mitwirkendem {search}"
+                "en": "<b>Not</b> made by contributor {search}"
               }
             }
           ]
@@ -489,8 +468,7 @@
                 }
               ],
               "question": {
-                "en": "Made before {search}",
-                "de": "Erstellt vor {search}"
+                "en": "Made before {search}"
               }
             }
           ]
@@ -507,8 +485,7 @@
                 }
               ],
               "question": {
-                "en": "Made after {search}",
-                "de": "Erstellt nach {search}"
+                "en": "Made after {search}"
               }
             }
           ]
@@ -524,8 +501,7 @@
                 }
               ],
               "question": {
-                "en": "User language (iso-code) {search}",
-                "de": "Benutzersprache (ISO-Code) {search}"
+                "en": "User language (iso-code) {search}"
               }
             }
           ]
@@ -541,8 +517,7 @@
                 }
               ],
               "question": {
-                "en": "Made with host {search}",
-                "de": "Erstellt mit host {search}"
+                "en": "Made with host {search}"
               }
             }
           ]
@@ -557,8 +532,7 @@
           {
             "id": "link_to_more",
             "render": {
-              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
-              "de": "Weitere Statistiken finden Sie unter <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a>"
+              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
             }
           },
           {

From e5d67d42c854f6b510e724b8e50d89d4dac2823f Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 5 Dec 2022 23:14:21 +0100
Subject: [PATCH 06/23] Translation reset

---
 langs/layers/de.json           | 24 +++++++++++++------
 langs/layers/en.json           | 44 ++++++++++++++++++++++++++++------
 langs/layers/fr.json           | 24 +++++++++++++------
 langs/layers/nl.json           | 36 ++++++++++++++++++++++------
 langs/shared-questions/en.json | 12 ++++++++++
 langs/themes/nl.json           | 11 +--------
 6 files changed, 113 insertions(+), 38 deletions(-)

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

From fe1cd0f1200445606b01a7694f3802cb07727ffe Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:49:34 +0100
Subject: [PATCH 07/23] Add option to deleteConfig to remove the default delete
 options

---
 Models/ThemeConfig/DeleteConfig.ts          | 22 +++++++++++++++++----
 Models/ThemeConfig/Json/DeleteConfigJson.ts |  6 ++++++
 UI/Popup/DeleteWizard.ts                    | 17 +++-------------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/Models/ThemeConfig/DeleteConfig.ts b/Models/ThemeConfig/DeleteConfig.ts
index 36f6516937..8eb92041a7 100644
--- a/Models/ThemeConfig/DeleteConfig.ts
+++ b/Models/ThemeConfig/DeleteConfig.ts
@@ -5,7 +5,7 @@ import Translations from "../../UI/i18n/Translations"
 import { TagUtils } from "../../Logic/Tags/TagUtils"
 
 export default class DeleteConfig {
-    public static readonly defaultDeleteReasons: {
+    private static readonly defaultDeleteReasons: {
         changesetMessage: string
         explanation: Translation
     }[] = [
@@ -27,8 +27,8 @@ export default class DeleteConfig {
         },
     ]
 
-    public readonly extraDeleteReasons?: {
-        explanation: TypedTranslation<object>
+    public readonly deleteReasons?: {
+        explanation: TypedTranslation<object> | Translation
         changesetMessage: string
     }[]
 
@@ -38,7 +38,7 @@ export default class DeleteConfig {
     public readonly neededChangesets?: number
 
     constructor(json: DeleteConfigJson, context: string) {
-        this.extraDeleteReasons = (json.extraDeleteReasons ?? []).map((reason, i) => {
+        this.deleteReasons = (json.extraDeleteReasons ?? []).map((reason, i) => {
             const ctx = `${context}.extraDeleteReasons[${i}]`
             if ((reason.changesetMessage ?? "").length <= 5) {
                 throw `${ctx}.explanation is too short, needs at least 4 characters`
@@ -48,6 +48,16 @@ export default class DeleteConfig {
                 changesetMessage: reason.changesetMessage,
             }
         })
+
+        if(!json.omitDefaultDeleteReasons ){
+            for (const defaultDeleteReason of DeleteConfig.defaultDeleteReasons) {
+                this.deleteReasons.push({
+                    changesetMessage: defaultDeleteReason.changesetMessage,
+                    explanation: defaultDeleteReason.explanation.Clone(/*Must clone, hides translation otherwise*/)
+                })
+            }
+        }
+
         this.nonDeleteMappings = (json.nonDeleteMappings ?? []).map((nonDelete, i) => {
             const ctx = `${context}.extraDeleteReasons[${i}]`
             return {
@@ -56,6 +66,10 @@ export default class DeleteConfig {
             }
         })
 
+        if(this.nonDeleteMappings.length + this.deleteReasons.length == 0){
+            throw "At "+context+": a deleteconfig should have some reasons to delete: either the default delete reasons or a nonDeleteMapping or extraDeletereason should be given"
+        }
+
         this.softDeletionTags = undefined
         if (json.softDeletionTags !== undefined) {
             this.softDeletionTags = TagUtils.Tag(
diff --git a/Models/ThemeConfig/Json/DeleteConfigJson.ts b/Models/ThemeConfig/Json/DeleteConfigJson.ts
index 84e2ec8899..653a040d0c 100644
--- a/Models/ThemeConfig/Json/DeleteConfigJson.ts
+++ b/Models/ThemeConfig/Json/DeleteConfigJson.ts
@@ -72,4 +72,10 @@ export interface DeleteConfigJson {
      * For some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.
      */
     neededChangesets?: number
+
+    /**
+     * Set this flag if the default delete reasons should be omitted from the dialog.
+     * This requires at least one extraDeleteReason or nonDeleteMapping
+     */
+    omitDefaultDeleteReasons?: false | boolean
 }
diff --git a/UI/Popup/DeleteWizard.ts b/UI/Popup/DeleteWizard.ts
index 862e660de0..b4803897cb 100644
--- a/UI/Popup/DeleteWizard.ts
+++ b/UI/Popup/DeleteWizard.ts
@@ -235,7 +235,7 @@ export default class DeleteWizard extends Toggle {
                                     return t.explanations.hardDelete
                                 }
                                 // This is a soft deletion: we explain _why_ the deletion is soft
-                                return t.explanations.softDelete.Subs({ reason: reason })
+                                return t.explanations.softDelete.Subs({ reason: reason})
                             })
                         )
                     }
@@ -263,7 +263,7 @@ export default class DeleteWizard extends Toggle {
             )
         }
 
-        for (const extraDeleteReason of config.extraDeleteReasons ?? []) {
+        for (const extraDeleteReason of config.deleteReasons ?? []) {
             elements.push(
                 new FixedInputElement(
                     new SubstitutedTranslation(extraDeleteReason.explanation, tagsSource, state),
@@ -274,17 +274,6 @@ export default class DeleteWizard extends Toggle {
             )
         }
 
-        for (const extraDeleteReason of DeleteConfig.defaultDeleteReasons) {
-            elements.push(
-                new FixedInputElement(
-                    extraDeleteReason.explanation.Clone(/*Must clone here, as this explanation might be used on many locations*/),
-                    {
-                        deleteReason: extraDeleteReason.changesetMessage,
-                    }
-                )
-            )
-        }
-
         return new RadioButton(elements, { selectFirstAsDefault: false })
     }
 }
@@ -453,7 +442,7 @@ class DeleteabilityChecker {
                 return
             }
             if (waysOrRelations) {
-                // not deleteble by mapcomplete
+                // not deleteable by mapcomplete
                 state.setData({
                     canBeDeleted: false,
                     reason: t.partOfOthers,

From 25429581116609b5f0173c83e3f6a50da1bbc6ff Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:50:12 +0100
Subject: [PATCH 08/23] Make has_image-option translatable

---
 assets/layers/filters/filters.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index 97e2935954..181b3f8d2f 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -61,7 +61,10 @@
       "id": "has_image",
       "options": [
         {
-          "question": "With and without images"
+          "question": {
+            "en":"With and without images",
+            "nl": "Met en zonder afbeelding"
+          }
         },
         {
           "question": {
@@ -170,4 +173,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

From f16cf31b40bde88c1719b318d587aafccbddf798 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:50:59 +0100
Subject: [PATCH 09/23] Add inscription options and memorial option for benches

---
 assets/layers/bench/bench.json | 157 ++++++++++++++++++++++++++++++---
 1 file changed, 145 insertions(+), 12 deletions(-)

diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index 50f2af4bc2..01e640e1c2 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -50,6 +50,15 @@
       "pa_PK": "بینچ"
     }
   },
+  "description": {
+    "nl": "Een zitbank is een houten, metalen, stenen, … oppervlak waar een mens kan zitten. Deze laag toont ze en stelt er enkele vragen over.",
+    "en": "A bench is a wooden, metal, stone, … surface where a human can sit. This layers visualises them and asks a few questions about them.",
+    "fr": "Un banc est une surface en bois, métal, pierre… sur laquelle un humain peut s'asseoir. Cette couche permet de les visualiser et pose des questions à leur sujet.",
+    "de": "Diese Karte stellt Sitzbänke aus Holz, Metall, Stein, … dar und stellt ein paar Fragen, um weitere Informationen zu ergänzen.",
+    "es": "Un banco es una superficie de madera, metal, piedra, ... donde un humano se puede sentar. Estas capas los visualizan y hacen algunas preguntas sobre ellos.",
+    "da": "En bænk er en træ-, metal-, sten-, ... overflade, hvor et menneske kan sidde. Dette lag visualiserer dem og stiller et par spørgsmål om dem.",
+    "cs": "Lavička je dřevěná, kovová, kamenná, ... plocha, na které může člověk sedět. Tato vrstva je vizualizuje a klade si o nich několik otázek."
+  },
   "tagRenderings": [
     "images",
     {
@@ -167,7 +176,16 @@
         "da": "Hvor mange pladser har denne bænk?",
         "cs": "Kolik má tato lavice míst k sezení?"
       },
-      "id": "bench-seats"
+      "id": "bench-seats",
+      "mappings": [
+        {
+          "if": "seats:separated=no",
+          "then": {
+            "en": "This bench does not have separated seats",
+            "nl": "Deze bank is niet ingedeeld in aparte zitplaatsen"
+          }
+        }
+      ]
     },
     {
       "render": {
@@ -680,10 +698,93 @@
       "mappings": [
         {
           "if": "survey:date:={_now:date}",
-          "then": "Surveyed today!"
+          "then": {
+           "en": "Surveyed today!",
+            "nl": "Vandaag nagekeken!"
+          }
         }
       ],
       "id": "bench-survey:date"
+    },
+    {
+      "id": "bench-inscription",
+      "render": {
+        "en": "This bench does have the following inscription:<br/><p><i>{inscription}</i></p>",
+        "nl": "Deze bank heeft een inscriptie: <br/><p><i>{inscription}</i></p>"
+      },
+      "question": {
+        "en": "Does this bench have an inscription?<div class='subtle text-lg'>E.g. on a mounted plaque, in the backrest, ...</div>",
+        "nl": "Heeft deze bank een inscriptie?<div class='subtle text-lg'>Bijvoorbeeld op een aangebracht plakkaat, ingesneden in de rugleuning, ...</div>"
+      },
+      "freeform": {
+        "key": "inscription",
+        "type": "text",
+        "addExtraTags": [
+          "not:inscription="
+        ]
+      },
+      "mappings": [
+        {
+          "if": "not:inscription=yes",
+          "then": {
+            "en": "This bench does not have an inscription",
+            "nl": "Deze bank heeft geen inscriptie"
+          },
+          "addExtraTags": [
+            "inscription="
+          ]
+        },
+        {
+          "if": "inscription=",
+          "then": {
+            "en": "This bench does <span class='subtle'>(probably)</span> not have an inscription",
+            "nl": "Deze bank heeft <span class='subtle'>(waarschijnlijk)</span> geen inscriptie"
+          },
+          "hideInAnswer": true
+        }
+      ]
+    },
+    {
+      "id": "bench-memorial",
+      "condition": {
+        "or": [
+          "historic=memorial",
+          "inscription~*",
+          "memorial=bench"
+        ]
+      },
+      "question": {
+        "en": "Does this bench act as memorial for someone or something?",
+        "nl": "Is deze bank een gedenkteken voor iemand of iets?"
+      },
+      "mappings": [
+        {
+          "if": "historic=memorial",
+          "then": {
+            "en": "This bench is a memorial for someone or something",
+            "nl": "Deze bank is een gedenkteken aan iemand of iets"
+          },
+          "addExtraTags": [
+            "memorial=bench"
+          ]
+        },
+        {
+          "if": {
+            "and": [
+              "historic=",
+              "memorial=",
+              "not:historic=memorial"
+            ]
+          },
+          "then": {
+            "en": "This bench is a <b>not</b> a memorial for someone or something",
+            "nl": "Deze bank is <b>geen</b> gedenkteken aan iemand of iets"
+          },
+          "addExtraTags": [
+            "memorial=bench"
+          ]
+        }
+      ]
     }
   ],
   "presets": [
@@ -743,13 +844,45 @@
       ]
     }
   ],
-  "description": {
-    "nl": "Een zitbank is een houten, metalen, stenen, … oppervlak waar een mens kan zitten. Deze laag toont ze en stelt er enkele vragen over.",
-    "en": "A bench is a wooden, metal, stone, … surface where a human can sit. This layers visualises them and asks a few questions about them.",
-    "fr": "Un banc est une surface en bois, métal, pierre… sur laquelle un humain peut s'asseoir. Cette couche permet de les visualiser et pose des questions à leur sujet.",
-    "de": "Diese Karte stellt Sitzbänke aus Holz, Metall, Stein, … dar und stellt ein paar Fragen, um weitere Informationen zu ergänzen.",
-    "es": "Un banco es una superficie de madera, metal, piedra, ... donde un humano se puede sentar. Estas capas los visualizan y hacen algunas preguntas sobre ellos.",
-    "da": "En bænk er en træ-, metal-, sten-, ... overflade, hvor et menneske kan sidde. Dette lag visualiserer dem og stiller et par spørgsmål om dem.",
-    "cs": "Lavička je dřevěná, kovová, kamenná, ... plocha, na které může člověk sedět. Tato vrstva je vizualizuje a klade si o nich několik otázek."
-  }
-}
\ No newline at end of file
+  "filter": [
+    {
+      "id": "bench_is_memorial",
+      "options": [{
+        "osmTags": {
+          "or": ["historic=memorial","memorial=bench"]
+        },
+        "question": {
+          "en": "is a memorial",
+          "nl": "is een gedenkteken"
+        }
+      }
+      ]
+    },
+    {
+      "id": "has_backrest",
+      "options": [
+        {
+          "question": {
+            "en":"With and without backrest",
+            "nl": "Met en zonder rugleuning"
+          }
+        },
+        {
+          "osmTags": "backrest=yes",
+          "question": {
+            "en": "Has a backrest",
+            "nl": "Heeft een rugleuning"
+          }
+        },
+        {
+          "osmTags": "backrest=no",
+          "question": {
+            "en": "Has no backrest",
+            "nl": "Heeft geen rugleuning"
+          }
+        }
+      ]
+    },
+    "has_image"
+  ]
+}

From 6c82614daf0f34707371c95031330f6181a69a7e Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:52:07 +0100
Subject: [PATCH 10/23] Add delete option for bench_at_pt (fix #1151);
 bench=yes now also requires that highway=bus_stop is present (fix #1152)

---
 assets/layers/bench_at_pt/bench_at_pt.json | 35 +++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/assets/layers/bench_at_pt/bench_at_pt.json b/assets/layers/bench_at_pt/bench_at_pt.json
index ce43197f1a..cae6134077 100644
--- a/assets/layers/bench_at_pt/bench_at_pt.json
+++ b/assets/layers/bench_at_pt/bench_at_pt.json
@@ -21,9 +21,14 @@
   "minzoom": 14,
   "source": {
     "osmTags": {
-      "or": [
-        "bench=yes",
-        "bench=stand_up_bench"
+      "and": [
+        "highway=bus_stop",
+        {
+          "or": [
+            "bench=yes",
+            "bench=stand_up_bench"
+          ]
+        }
       ]
     }
   },
@@ -209,6 +214,28 @@
       }
     }
   ],
+  "deletion": {
+    "omitDefaultDeleteReasons": true,
+    "nonDeleteMappings": [
+      {
+        "if": "bench=no",
+        "then": {
+          "en": "This bus stop does not have a bench (there never was one or it has been removed)"
+        }
+      }
+    ],
+    "extraDeleteReasons": [
+      {
+        "changesetMessage": "discontinued",
+        "explanation": {
+          "en": "This bus stop is not used anymore"
+        }
+      }
+    ],
+    "softDeletionTags": {
+      "and": ["disused:highway=bus_stop","bench=no"]
+    }
+  },
   "description": {
     "en": "A layer showing all public-transport-stops which do have a bench",
     "es": "Una capa que muestra todas las paradas de transporte público que tienen bancos",
@@ -218,4 +245,4 @@
     "da": "Et lag, der viser alle offentlige stoppesteder, som har en bænk",
     "cs": "Vrstva zobrazující všechny zastávky veřejné dopravy, které mají lavičku"
   }
-}
\ No newline at end of file
+}

From 3b688b0af634aa885b5b98deda267df13990b4b6 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:52:31 +0100
Subject: [PATCH 11/23] Move picnic benches up, see #1152

---
 assets/themes/benches/benches.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/themes/benches/benches.json b/assets/themes/benches/benches.json
index 4ea140ccde..1dbe93fbd9 100644
--- a/assets/themes/benches/benches.json
+++ b/assets/themes/benches/benches.json
@@ -58,9 +58,9 @@
   "startZoom": 1,
   "widenFactor": 1.5,
   "layers": [
+    "picnic_table",
     "bench",
-    "bench_at_pt",
-    "picnic_table"
+    "bench_at_pt"
   ],
   "credits": "Florian Edelmann"
-}
\ No newline at end of file
+}

From 33833f27b40106d213729f7b170fe759fabd8d71 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:52:41 +0100
Subject: [PATCH 12/23] Fix typo in etymology layer

---
 assets/layers/etymology/etymology.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index f014ef726b..bf2cfb0b99 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -328,7 +328,7 @@
         "de": "<a href='https://inventaris.onroerenderfgoed.be/erfgoedobjecten?tekst={name}' target='_blank'>Suche auf inventaris onroerend erfgoed</a>",
         "fr": "<a href='https://inventaris.onroerenderfgoed.be/erfgoedobjecten?tekst={name}' target='_blank'>Chercher sur inventaris onroerend erfgoed</a>"
       },
-      "conditions": "_country=be"
+      "condition": "_country=be"
     },
     {
       "id": "simple etymology",
@@ -454,4 +454,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}

From 7e48cf76566bb4aba57c1fc5a0f4ab14881e2919 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:53:33 +0100
Subject: [PATCH 13/23] Update schame files

---
 Docs/Schemas/DeleteConfigJson.schema.json     |  4 ++
 Docs/Schemas/DeleteConfigJsonJSC.ts           |  4 ++
 Docs/Schemas/LayerConfigJson.schema.json      | 23 ++++++++---
 Docs/Schemas/LayerConfigJsonJSC.ts            | 23 ++++++++---
 Docs/Schemas/LayoutConfigJson.schema.json     | 25 ++++++++----
 Docs/Schemas/LayoutConfigJsonJSC.ts           | 25 ++++++++----
 Docs/Schemas/MappingConfigJson.schema.json    |  2 +-
 Docs/Schemas/MappingConfigJsonJSC.ts          |  2 +-
 ...tionableTagRenderingConfigJson.schema.json |  2 +-
 .../QuestionableTagRenderingConfigJsonJSC.ts  |  2 +-
 Docs/Schemas/RewritableConfigJson.schema.json |  4 +-
 Docs/Schemas/RewritableConfigJsonJSC.ts       |  4 +-
 Docs/Schemas/TilesourceConfigJson.schema.json | 10 +++--
 Docs/Schemas/TilesourceConfigJsonJSC.ts       | 10 +++--
 assets/layoutconfigmeta.json                  | 40 +++++++++++++------
 .../questionabletagrenderingconfigmeta.json   |  2 +-
 16 files changed, 129 insertions(+), 53 deletions(-)

diff --git a/Docs/Schemas/DeleteConfigJson.schema.json b/Docs/Schemas/DeleteConfigJson.schema.json
index e0b80f573b..398b287679 100644
--- a/Docs/Schemas/DeleteConfigJson.schema.json
+++ b/Docs/Schemas/DeleteConfigJson.schema.json
@@ -60,6 +60,10 @@
     "neededChangesets": {
       "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
       "type": "number"
+    },
+    "omitDefaultDeleteReasons": {
+      "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+      "type": "boolean"
     }
   },
   "definitions": {
diff --git a/Docs/Schemas/DeleteConfigJsonJSC.ts b/Docs/Schemas/DeleteConfigJsonJSC.ts
index 14fd5ed83f..04e4b61143 100644
--- a/Docs/Schemas/DeleteConfigJsonJSC.ts
+++ b/Docs/Schemas/DeleteConfigJsonJSC.ts
@@ -60,6 +60,10 @@ export default {
     "neededChangesets": {
       "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
       "type": "number"
+    },
+    "omitDefaultDeleteReasons": {
+      "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+      "type": "boolean"
     }
   },
   "definitions": {
diff --git a/Docs/Schemas/LayerConfigJson.schema.json b/Docs/Schemas/LayerConfigJson.schema.json
index 76fa17cedf..5c1b2780dd 100644
--- a/Docs/Schemas/LayerConfigJson.schema.json
+++ b/Docs/Schemas/LayerConfigJson.schema.json
@@ -37,7 +37,7 @@
               "type": "object",
               "properties": {
                 "overpassScript": {
-                  "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible: \n```\n\"source\": {\n  \"overpassScript\": \n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
+                  "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
                   "type": "string"
                 }
               }
@@ -371,12 +371,19 @@
       }
     },
     "filter": {
-      "description": "All the extra questions for filtering",
+      "description": "All the extra questions for filtering.\nIf a string is given, mapComplete will search in 'filters.json' for the appropriate filter",
       "anyOf": [
         {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/default_1"
+            "anyOf": [
+              {
+                "$ref": "#/definitions/default_1"
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         },
         {
@@ -704,7 +711,7 @@
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
@@ -957,7 +964,7 @@
       "additionalProperties": false
     },
     "default<default|default|default[]|default[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1205,7 +1212,7 @@
       "additionalProperties": false
     },
     "default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1391,6 +1398,10 @@
         "neededChangesets": {
           "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
           "type": "number"
+        },
+        "omitDefaultDeleteReasons": {
+          "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+          "type": "boolean"
         }
       },
       "additionalProperties": false
diff --git a/Docs/Schemas/LayerConfigJsonJSC.ts b/Docs/Schemas/LayerConfigJsonJSC.ts
index 1b283a7ec9..26a8e48358 100644
--- a/Docs/Schemas/LayerConfigJsonJSC.ts
+++ b/Docs/Schemas/LayerConfigJsonJSC.ts
@@ -37,7 +37,7 @@ export default {
               "type": "object",
               "properties": {
                 "overpassScript": {
-                  "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible: \n```\n\"source\": {\n  \"overpassScript\": \n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
+                  "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
                   "type": "string"
                 }
               }
@@ -371,12 +371,19 @@ export default {
       }
     },
     "filter": {
-      "description": "All the extra questions for filtering",
+      "description": "All the extra questions for filtering.\nIf a string is given, mapComplete will search in 'filters.json' for the appropriate filter",
       "anyOf": [
         {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/default_1"
+            "anyOf": [
+              {
+                "$ref": "#/definitions/default_1"
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         },
         {
@@ -699,7 +706,7 @@ export default {
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
@@ -948,7 +955,7 @@ export default {
       }
     },
     "default<default|default|default[]|default[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1193,7 +1200,7 @@ export default {
       }
     },
     "default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1377,6 +1384,10 @@ export default {
         "neededChangesets": {
           "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
           "type": "number"
+        },
+        "omitDefaultDeleteReasons": {
+          "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+          "type": "boolean"
         }
       }
     },
diff --git a/Docs/Schemas/LayoutConfigJson.schema.json b/Docs/Schemas/LayoutConfigJson.schema.json
index 0496a42508..81dcad724e 100644
--- a/Docs/Schemas/LayoutConfigJson.schema.json
+++ b/Docs/Schemas/LayoutConfigJson.schema.json
@@ -75,7 +75,7 @@
       }
     },
     "layers": {
-      "description": "The layers to display.\n\nEvery layer contains a description of which feature to display - the overpassTags which are queried.\nInstead of running one query for every layer, the query is fused.\n\nAfterwards, every layer is given the list of features.\nEvery layer takes away the features that match with them*, and give the leftovers to the next layers.\n\nThis implies that the _order_ of the layers is important in the case of features with the same tags;\nas the later layers might never receive their feature.\n\n*layers can also remove 'leftover'-features if the leftovers overlap with a feature in the layer itself\n\nNote that builtin layers can be reused. Either put in the name of the layer to reuse, or use {builtin: \"layername\", override: ...}\n\nThe 'override'-object will be copied over the original values of the layer, which allows to change certain aspects of the layer\n\nFor example: If you would like to use layer nature reserves, but only from a specific operator (eg. Natuurpunt) you would use the following in your theme:\n\n```\n\"layer\": {\n \"builtin\": \"nature_reserve\",\n \"override\": {\"source\": \n {\"osmTags\": {\n \"+and\":[\"operator=Natuurpunt\"]\n   }\n  }\n }\n}\n```\n\nIt's also possible to load multiple layers at once, for example, if you would like for both drinking water and benches to start at the zoomlevel at 12, you would use the following:\n\n```\n\"layer\": {\n \"builtin\": [\"benches\", \"drinking_water\"],\n \"override\": {\"minzoom\": 12}\n}\n```",
+      "description": "The layers to display.\n\nEvery layer contains a description of which feature to display - the overpassTags which are queried.\nInstead of running one query for every layer, the query is fused.\n\nAfterwards, every layer is given the list of features.\nEvery layer takes away the features that match with them*, and give the leftovers to the next layers.\n\nThis implies that the _order_ of the layers is important in the case of features with the same tags;\nas the later layers might never receive their feature.\n\n*layers can also remove 'leftover'-features if the leftovers overlap with a feature in the layer itself\n\nNote that builtin layers can be reused. Either put in the name of the layer to reuse, or use {builtin: \"layername\", override: ...}\n\nThe 'override'-object will be copied over the original values of the layer, which allows to change certain aspects of the layer\n\nFor example: If you would like to use layer nature reserves, but only from a specific operator (eg. Natuurpunt) you would use the following in your theme:\n\n```\n\"layer\": {\n \"builtin\": \"nature_reserve\",\n \"override\": {\"source\":\n {\"osmTags\": {\n \"+and\":[\"operator=Natuurpunt\"]\n   }\n  }\n }\n}\n```\n\nIt's also possible to load multiple layers at once, for example, if you would like for both drinking water and benches to start at the zoomlevel at 12, you would use the following:\n\n```\n\"layer\": {\n \"builtin\": [\"benches\", \"drinking_water\"],\n \"override\": {\"minzoom\": 12}\n}\n```",
       "type": "array",
       "items": {
         "anyOf": [
@@ -541,7 +541,7 @@
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
@@ -794,7 +794,7 @@
       "additionalProperties": false
     },
     "default<default|default|default[]|default[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1042,7 +1042,7 @@
       "additionalProperties": false
     },
     "default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1228,6 +1228,10 @@
         "neededChangesets": {
           "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
           "type": "number"
+        },
+        "omitDefaultDeleteReasons": {
+          "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+          "type": "boolean"
         }
       },
       "additionalProperties": false
@@ -1356,7 +1360,7 @@
                   "type": "object",
                   "properties": {
                     "overpassScript": {
-                      "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible: \n```\n\"source\": {\n  \"overpassScript\": \n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
+                      "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
                       "type": "string"
                     }
                   }
@@ -1690,12 +1694,19 @@
           }
         },
         "filter": {
-          "description": "All the extra questions for filtering",
+          "description": "All the extra questions for filtering.\nIf a string is given, mapComplete will search in 'filters.json' for the appropriate filter",
           "anyOf": [
             {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/default_1"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/default_1"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               }
             },
             {
diff --git a/Docs/Schemas/LayoutConfigJsonJSC.ts b/Docs/Schemas/LayoutConfigJsonJSC.ts
index e578e59970..c38c0218fb 100644
--- a/Docs/Schemas/LayoutConfigJsonJSC.ts
+++ b/Docs/Schemas/LayoutConfigJsonJSC.ts
@@ -75,7 +75,7 @@ export default {
       }
     },
     "layers": {
-      "description": "The layers to display.\n\nEvery layer contains a description of which feature to display - the overpassTags which are queried.\nInstead of running one query for every layer, the query is fused.\n\nAfterwards, every layer is given the list of features.\nEvery layer takes away the features that match with them*, and give the leftovers to the next layers.\n\nThis implies that the _order_ of the layers is important in the case of features with the same tags;\nas the later layers might never receive their feature.\n\n*layers can also remove 'leftover'-features if the leftovers overlap with a feature in the layer itself\n\nNote that builtin layers can be reused. Either put in the name of the layer to reuse, or use {builtin: \"layername\", override: ...}\n\nThe 'override'-object will be copied over the original values of the layer, which allows to change certain aspects of the layer\n\nFor example: If you would like to use layer nature reserves, but only from a specific operator (eg. Natuurpunt) you would use the following in your theme:\n\n```\n\"layer\": {\n \"builtin\": \"nature_reserve\",\n \"override\": {\"source\": \n {\"osmTags\": {\n \"+and\":[\"operator=Natuurpunt\"]\n   }\n  }\n }\n}\n```\n\nIt's also possible to load multiple layers at once, for example, if you would like for both drinking water and benches to start at the zoomlevel at 12, you would use the following:\n\n```\n\"layer\": {\n \"builtin\": [\"benches\", \"drinking_water\"],\n \"override\": {\"minzoom\": 12}\n}\n```",
+      "description": "The layers to display.\n\nEvery layer contains a description of which feature to display - the overpassTags which are queried.\nInstead of running one query for every layer, the query is fused.\n\nAfterwards, every layer is given the list of features.\nEvery layer takes away the features that match with them*, and give the leftovers to the next layers.\n\nThis implies that the _order_ of the layers is important in the case of features with the same tags;\nas the later layers might never receive their feature.\n\n*layers can also remove 'leftover'-features if the leftovers overlap with a feature in the layer itself\n\nNote that builtin layers can be reused. Either put in the name of the layer to reuse, or use {builtin: \"layername\", override: ...}\n\nThe 'override'-object will be copied over the original values of the layer, which allows to change certain aspects of the layer\n\nFor example: If you would like to use layer nature reserves, but only from a specific operator (eg. Natuurpunt) you would use the following in your theme:\n\n```\n\"layer\": {\n \"builtin\": \"nature_reserve\",\n \"override\": {\"source\":\n {\"osmTags\": {\n \"+and\":[\"operator=Natuurpunt\"]\n   }\n  }\n }\n}\n```\n\nIt's also possible to load multiple layers at once, for example, if you would like for both drinking water and benches to start at the zoomlevel at 12, you would use the following:\n\n```\n\"layer\": {\n \"builtin\": [\"benches\", \"drinking_water\"],\n \"override\": {\"minzoom\": 12}\n}\n```",
       "type": "array",
       "items": {
         "anyOf": [
@@ -536,7 +536,7 @@ export default {
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
@@ -785,7 +785,7 @@ export default {
       }
     },
     "default<default|default|default[]|default[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1030,7 +1030,7 @@ export default {
       }
     },
     "default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -1214,6 +1214,10 @@ export default {
         "neededChangesets": {
           "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
           "type": "number"
+        },
+        "omitDefaultDeleteReasons": {
+          "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+          "type": "boolean"
         }
       }
     },
@@ -1337,7 +1341,7 @@ export default {
                   "type": "object",
                   "properties": {
                     "overpassScript": {
-                      "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible: \n```\n\"source\": {\n  \"overpassScript\": \n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
+                      "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
                       "type": "string"
                     }
                   }
@@ -1671,12 +1675,19 @@ export default {
           }
         },
         "filter": {
-          "description": "All the extra questions for filtering",
+          "description": "All the extra questions for filtering.\nIf a string is given, mapComplete will search in 'filters.json' for the appropriate filter",
           "anyOf": [
             {
               "type": "array",
               "items": {
-                "$ref": "#/definitions/default_1"
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/default_1"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               }
             },
             {
diff --git a/Docs/Schemas/MappingConfigJson.schema.json b/Docs/Schemas/MappingConfigJson.schema.json
index 11ecaed7fa..01171adc53 100644
--- a/Docs/Schemas/MappingConfigJson.schema.json
+++ b/Docs/Schemas/MappingConfigJson.schema.json
@@ -34,7 +34,7 @@
       ]
     },
     "hideInAnswer": {
-      "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+      "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
       "anyOf": [
         {
           "$ref": "#/definitions/AndTagConfigJson",
diff --git a/Docs/Schemas/MappingConfigJsonJSC.ts b/Docs/Schemas/MappingConfigJsonJSC.ts
index 6287ec7658..fc0104189e 100644
--- a/Docs/Schemas/MappingConfigJsonJSC.ts
+++ b/Docs/Schemas/MappingConfigJsonJSC.ts
@@ -34,7 +34,7 @@ export default {
       ]
     },
     "hideInAnswer": {
-      "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+      "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
       "anyOf": [
         {
           "$ref": "#/definitions/AndTagConfigJson",
diff --git a/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json b/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
index bc69312af4..f9066d1c72 100644
--- a/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
@@ -356,7 +356,7 @@
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
diff --git a/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts b/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
index f2614312d9..502127f1e4 100644
--- a/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
@@ -351,7 +351,7 @@ export default {
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
diff --git a/Docs/Schemas/RewritableConfigJson.schema.json b/Docs/Schemas/RewritableConfigJson.schema.json
index bdbaf7af50..860894deda 100644
--- a/Docs/Schemas/RewritableConfigJson.schema.json
+++ b/Docs/Schemas/RewritableConfigJson.schema.json
@@ -1,5 +1,5 @@
 {
-  "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+  "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
   "type": "object",
   "properties": {
     "rewrite": {
@@ -295,7 +295,7 @@
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
diff --git a/Docs/Schemas/RewritableConfigJsonJSC.ts b/Docs/Schemas/RewritableConfigJsonJSC.ts
index e3ecabb7b7..fcca097850 100644
--- a/Docs/Schemas/RewritableConfigJsonJSC.ts
+++ b/Docs/Schemas/RewritableConfigJsonJSC.ts
@@ -1,5 +1,5 @@
 export default {
-  "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+  "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
   "type": "object",
   "properties": {
     "rewrite": {
@@ -290,7 +290,7 @@ export default {
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
diff --git a/Docs/Schemas/TilesourceConfigJson.schema.json b/Docs/Schemas/TilesourceConfigJson.schema.json
index 921f6fb15a..cd4b842353 100644
--- a/Docs/Schemas/TilesourceConfigJson.schema.json
+++ b/Docs/Schemas/TilesourceConfigJson.schema.json
@@ -298,7 +298,7 @@
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
@@ -551,7 +551,7 @@
       "additionalProperties": false
     },
     "default<default|default|default[]|default[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -799,7 +799,7 @@
       "additionalProperties": false
     },
     "default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -985,6 +985,10 @@
         "neededChangesets": {
           "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
           "type": "number"
+        },
+        "omitDefaultDeleteReasons": {
+          "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+          "type": "boolean"
         }
       },
       "additionalProperties": false
diff --git a/Docs/Schemas/TilesourceConfigJsonJSC.ts b/Docs/Schemas/TilesourceConfigJsonJSC.ts
index d40d4f9a75..532c862e36 100644
--- a/Docs/Schemas/TilesourceConfigJsonJSC.ts
+++ b/Docs/Schemas/TilesourceConfigJsonJSC.ts
@@ -293,7 +293,7 @@ export default {
           ]
         },
         "hideInAnswer": {
-          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
+          "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}",
           "anyOf": [
             {
               "$ref": "#/definitions/AndTagConfigJson",
@@ -542,7 +542,7 @@ export default {
       }
     },
     "default<default|default|default[]|default[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -787,7 +787,7 @@ export default {
       }
     },
     "default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>": {
-      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
+      "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]",
       "type": "object",
       "properties": {
         "rewrite": {
@@ -971,6 +971,10 @@ export default {
         "neededChangesets": {
           "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here.",
           "type": "number"
+        },
+        "omitDefaultDeleteReasons": {
+          "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping",
+          "type": "boolean"
         }
       }
     },
diff --git a/assets/layoutconfigmeta.json b/assets/layoutconfigmeta.json
index d97e44ac1a..bb9d964ad1 100644
--- a/assets/layoutconfigmeta.json
+++ b/assets/layoutconfigmeta.json
@@ -211,7 +211,7 @@
         "type": "string"
       }
     ],
-    "description": "The layers to display.\n\nEvery layer contains a description of which feature to display - the overpassTags which are queried.\nInstead of running one query for every layer, the query is fused.\n\nAfterwards, every layer is given the list of features.\nEvery layer takes away the features that match with them*, and give the leftovers to the next layers.\n\nThis implies that the _order_ of the layers is important in the case of features with the same tags;\nas the later layers might never receive their feature.\n\n*layers can also remove 'leftover'-features if the leftovers overlap with a feature in the layer itself\n\nNote that builtin layers can be reused. Either put in the name of the layer to reuse, or use {builtin: \"layername\", override: ...}\n\nThe 'override'-object will be copied over the original values of the layer, which allows to change certain aspects of the layer\n\nFor example: If you would like to use layer nature reserves, but only from a specific operator (eg. Natuurpunt) you would use the following in your theme:\n\n```\n\"layer\": {\n \"builtin\": \"nature_reserve\",\n \"override\": {\"source\": \n {\"osmTags\": {\n \"+and\":[\"operator=Natuurpunt\"]\n   }\n  }\n }\n}\n```\n\nIt's also possible to load multiple layers at once, for example, if you would like for both drinking water and benches to start at the zoomlevel at 12, you would use the following:\n\n```\n\"layer\": {\n \"builtin\": [\"benches\", \"drinking_water\"],\n \"override\": {\"minzoom\": 12}\n}\n```"
+    "description": "The layers to display.\n\nEvery layer contains a description of which feature to display - the overpassTags which are queried.\nInstead of running one query for every layer, the query is fused.\n\nAfterwards, every layer is given the list of features.\nEvery layer takes away the features that match with them*, and give the leftovers to the next layers.\n\nThis implies that the _order_ of the layers is important in the case of features with the same tags;\nas the later layers might never receive their feature.\n\n*layers can also remove 'leftover'-features if the leftovers overlap with a feature in the layer itself\n\nNote that builtin layers can be reused. Either put in the name of the layer to reuse, or use {builtin: \"layername\", override: ...}\n\nThe 'override'-object will be copied over the original values of the layer, which allows to change certain aspects of the layer\n\nFor example: If you would like to use layer nature reserves, but only from a specific operator (eg. Natuurpunt) you would use the following in your theme:\n\n```\n\"layer\": {\n \"builtin\": \"nature_reserve\",\n \"override\": {\"source\":\n {\"osmTags\": {\n \"+and\":[\"operator=Natuurpunt\"]\n   }\n  }\n }\n}\n```\n\nIt's also possible to load multiple layers at once, for example, if you would like for both drinking water and benches to start at the zoomlevel at 12, you would use the following:\n\n```\n\"layer\": {\n \"builtin\": [\"benches\", \"drinking_water\"],\n \"override\": {\"minzoom\": 12}\n}\n```"
   },
   {
     "path": [
@@ -270,7 +270,7 @@
             "type": "object",
             "properties": {
               "overpassScript": {
-                "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible: \n```\n\"source\": {\n  \"overpassScript\": \n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
+                "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
                 "type": "string"
               }
             }
@@ -393,7 +393,7 @@
       "overpassScript"
     ],
     "type": "string",
-    "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible: \n```\n\"source\": {\n  \"overpassScript\": \n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```"
+    "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```"
   },
   {
     "path": [
@@ -5976,7 +5976,7 @@
       "mapRendering"
     ],
     "type": "object",
-    "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]"
+    "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]"
   },
   {
     "path": [
@@ -16191,7 +16191,7 @@
         ]
       }
     ],
-    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
+    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
   },
   {
     "path": [
@@ -17033,7 +17033,7 @@
         ]
       }
     ],
-    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
+    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
   },
   {
     "path": [
@@ -17912,7 +17912,7 @@
         ]
       }
     ],
-    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
+    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
   },
   {
     "path": [
@@ -18545,7 +18545,7 @@
       "tagRenderings"
     ],
     "type": "object",
-    "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}. \nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]"
+    "description": "Rewrites and multiplies the given renderings of type T.\n\nThis can be used for introducing many similar questions automatically,\nwhich also makes translations easier.\n\n(Note that the key does _not_ need to be wrapped in {}.\nHowever, we recommend to use them if the key is used in a translation, as missing keys will be picked up and warned for by the translation scripts)\n\nFor example:\n\n```\n{\n    rewrite: {\n        sourceString: [\"key\", \"a|b|c\"],\n        into: [\n            [\"X\", 0]\n            [\"Y\", 1],\n            [\"Z\", 2]\n        ],\n        renderings: [{\n            \"key\":\"a|b|c\"\n        }]\n    }\n}\n```\nwill result in _three_ copies (as the values to rewrite into have three values, namely:\n\n[\n  {\n  # The first pair: key --> X, a|b|c --> 0\n      \"X\": 0\n  },\n  {\n      \"Y\": 1\n  },\n  {\n      \"Z\": 2\n  }\n\n]"
   },
   {
     "path": [
@@ -18808,7 +18808,7 @@
         ]
       }
     ],
-    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
+    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
   },
   {
     "path": [
@@ -19705,7 +19705,7 @@
         ]
       }
     ],
-    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
+    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
   },
   {
     "path": [
@@ -20378,7 +20378,14 @@
       {
         "type": "array",
         "items": {
-          "$ref": "#/definitions/default_1"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/default_1"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       },
       {
@@ -20393,7 +20400,7 @@
         ]
       }
     ],
-    "description": "All the extra questions for filtering"
+    "description": "All the extra questions for filtering.\nIf a string is given, mapComplete will search in 'filters.json' for the appropriate filter"
   },
   {
     "path": [
@@ -20820,6 +20827,15 @@
     "type": "number",
     "description": "*\nBy default, the contributor needs 20 previous changesets to delete points edited by others.\nFor some small features (e.g. bicycle racks) this is too much and this requirement can be lowered or dropped, which can be done here."
   },
+  {
+    "path": [
+      "layers",
+      "deletion",
+      "omitDefaultDeleteReasons"
+    ],
+    "type": "boolean",
+    "description": "Set this flag if the default delete reasons should be omitted from the dialog.\nThis requires at least one extraDeleteReason or nonDeleteMapping"
+  },
   {
     "path": [
       "layers",
diff --git a/assets/questionabletagrenderingconfigmeta.json b/assets/questionabletagrenderingconfigmeta.json
index a96eac8f3c..d9b10abc8b 100644
--- a/assets/questionabletagrenderingconfigmeta.json
+++ b/assets/questionabletagrenderingconfigmeta.json
@@ -202,7 +202,7 @@
         ]
       }
     ],
-    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n        \n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
+    "description": "In some cases, multiple taggings exist (e.g. a default assumption, or a commonly mapped abbreviation and a fully written variation).\n\nIn the latter case, a correct text should be shown, but only a single, canonical tagging should be selectable by the user.\nIn this case, one of the mappings can be hiden by setting this flag.\n\nTo demonstrate an example making a default assumption:\n\nmappings: [\n {\n     if: \"access=\", -- no access tag present, we assume accessible\n     then: \"Accessible to the general public\",\n     hideInAnswer: true\n },\n {\n     if: \"access=yes\",\n     then: \"Accessible to the general public\", -- the user selected this, we add that to OSM\n },\n {\n     if: \"access=no\",\n     then: \"Not accessible to the public\"\n }\n]\n\n\nFor example, for an operator, we have `operator=Agentschap Natuur en Bos`, which is often abbreviated to `operator=ANB`.\nThen, we would add two mappings:\n{\n    if: \"operator=Agentschap Natuur en Bos\" -- the non-abbreviated version which should be uploaded\n    then: \"Maintained by Agentschap Natuur en Bos\"\n},\n{\n    if: \"operator=ANB\", -- we don't want to upload abbreviations\n    then: \"Maintained by Agentschap Natuur en Bos\"\n    hideInAnswer: true\n}\n\nHide in answer can also be a tagsfilter, e.g. to make sure an option is only shown when appropriate.\nKeep in mind that this is reverse logic: it will be hidden in the answer if the condition is true, it will thus only show in the case of a mismatch\n\ne.g., for toilets: if \"wheelchair=no\", we know there is no wheelchair dedicated room.\nFor the location of the changing table, the option \"in the wheelchair accessible toilet is weird\", so we write:\n\n{\n    \"question\": \"Where is the changing table located?\"\n    \"mappings\": [\n        {\"if\":\"changing_table:location=female\",\"then\":\"In the female restroom\"},\n       {\"if\":\"changing_table:location=male\",\"then\":\"In the male restroom\"},\n       {\"if\":\"changing_table:location=wheelchair\",\"then\":\"In the wheelchair accessible restroom\", \"hideInAnswer\": \"wheelchair=no\"},\n\n    ]\n}\n\nAlso have a look for the meta-tags\n{\n    if: \"operator=Agentschap Natuur en Bos\",\n    then: \"Maintained by Agentschap Natuur en Bos\",\n    hideInAnswer: \"_country!=be\"\n}"
   },
   {
     "path": [

From 59f596a6b6fbecba7b3fcc2801206df9926c4535 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 00:53:55 +0100
Subject: [PATCH 14/23] Bump version number

---
 Models/Constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Models/Constants.ts b/Models/Constants.ts
index 67458043f1..0bea8bda31 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -1,7 +1,7 @@
 import { Utils } from "../Utils"
 
 export default class Constants {
-    public static vNumber = "0.24.0"
+    public static vNumber = "0.24.1"
 
     public static ImgurApiKey = "7070e7167f0a25a"
     public static readonly mapillary_client_token_v4 =

From e080f79f34d237623baa3407655416764e463e52 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 03:41:27 +0100
Subject: [PATCH 15/23] Generate docs with filter explanations

---
 Docs/BuiltinIndex.md                          |  35 +-
 Docs/BuiltinLayers.md                         |  90 ++-
 Docs/BuiltinQuestions.md                      |  17 +
 Docs/Layers/all_streets.md                    |   4 +-
 Docs/Layers/artwork.md                        | 231 ++++++-
 Docs/Layers/barrier.md                        |  10 +-
 Docs/Layers/bench.md                          | 112 +++-
 Docs/Layers/bench_at_pt.md                    |   3 +-
 Docs/Layers/bicycle_rental.md                 |  20 +-
 Docs/Layers/bicycle_rental_non_docking.md     |  20 +-
 Docs/Layers/bike_cleaning.md                  |   2 +-
 Docs/Layers/bike_parking.md                   |   2 +-
 Docs/Layers/bike_repair_station.md            |  12 +-
 Docs/Layers/bike_shop.md                      |  16 +-
 Docs/Layers/birdhide.md                       |  20 +
 Docs/Layers/cafe_pub.md                       |  31 +-
 Docs/Layers/caravansites.md                   |   4 +-
 Docs/Layers/charging_station.md               | 185 +++---
 Docs/Layers/charging_station_ebikes.md        | 138 ++--
 Docs/Layers/climbing.md                       |   4 +-
 Docs/Layers/climbing_area.md                  |   6 +-
 Docs/Layers/climbing_gym.md                   |   4 +-
 Docs/Layers/climbing_opportunity.md           |   2 +-
 Docs/Layers/crossings.md                      |  40 +-
 .../cultural_places_without_etymology.md      |   4 +-
 Docs/Layers/cycleways_and_roads.md            |  18 +-
 Docs/Layers/defibrillator.md                  |  26 +-
 Docs/Layers/dentist.md                        | 183 ++++++
 Docs/Layers/doctors.md                        |  60 +-
 Docs/Layers/dogfoodb.md                       | 105 +++-
 Docs/Layers/dogshop.md                        |  74 ++-
 Docs/Layers/drinking_water.md                 |   2 +-
 Docs/Layers/dumpstations.md                   |   2 +-
 ...ducation_institutions_without_etymology.md |   4 +-
 Docs/Layers/etymology.md                      |   4 +-
 Docs/Layers/fietsstraat.md                    |   4 +-
 Docs/Layers/filters.md                        |  60 ++
 Docs/Layers/fitness_centre.md                 |  13 +
 Docs/Layers/fitness_station.md                |  13 +
 Docs/Layers/food.md                           | 105 +++-
 Docs/Layers/friture.md                        | 105 +++-
 ...lth_and_social_places_without_etymology.md |   4 +-
 Docs/Layers/hotel.md                          |   4 +-
 Docs/Layers/indoors.md                        |   4 +-
 Docs/Layers/kerbs.md                          |  32 +-
 Docs/Layers/kindergarten_childcare.md         |   2 +-
 Docs/Layers/map.md                            |   2 +-
 Docs/Layers/maproulette.md                    |  37 +-
 Docs/Layers/maproulette_challenge.md          |  23 +-
 Docs/Layers/nature_reserve.md                 |  24 +-
 Docs/Layers/observation_tower.md              |  10 +-
 Docs/Layers/osm_community_index.md            |  59 +-
 Docs/Layers/parcel_lockers.md                 |  17 +-
 .../parks_and_forests_without_etymology.md    |   4 +-
 Docs/Layers/pharmacy.md                       |  27 +
 Docs/Layers/physiotherapist.md                | 190 ++++++
 Docs/Layers/postoffices.md                    |  17 +-
 Docs/Layers/public_bookcase.md                |  33 +-
 Docs/Layers/rainbow_crossing_high_zoom.md     |   2 +-
 Docs/Layers/rainbow_crossings.md              |   2 +-
 Docs/Layers/recycling.md                      |  47 +-
 Docs/Layers/school.md                         |   4 +-
 Docs/Layers/shops.md                          |  75 ++-
 Docs/Layers/speed_camera.md                   |   2 +-
 Docs/Layers/sport_pitch.md                    |  15 +-
 Docs/Layers/sport_places_without_etymology.md |   4 +-
 Docs/Layers/sport_shops.md                    | 595 ++++++++++++++++++
 Docs/Layers/sports_centre.md                  |  13 +
 Docs/Layers/stairs.md                         |   4 +-
 Docs/Layers/street_lamps.md                   |   6 +-
 Docs/Layers/streets_without_etymology.md      |   4 +-
 Docs/Layers/surveillance_camera.md            |   4 +-
 Docs/Layers/tertiary_education.md             |   2 +-
 Docs/Layers/toekomstige_fietsstraat.md        |   4 +-
 Docs/Layers/toilet.md                         |  42 +-
 Docs/Layers/toilet_at_amenity.md              |  40 +-
 .../toursistic_places_without_etymology.md    |   4 +-
 Docs/Layers/transit_stops.md                  |  36 +-
 Docs/Layers/tree_node.md                      |  12 +-
 Docs/Layers/walls_and_buildings.md            |   2 +-
 Docs/Layers/waste_basket.md                   |  26 +
 Docs/Layers/waste_disposal.md                 |  13 +
 Docs/SpecialInputElements.md                  |   4 +-
 Docs/TagInfo/mapcomplete_artwork.json         | 149 +++++
 Docs/TagInfo/mapcomplete_benches.json         | 187 ++++--
 Docs/TagInfo/mapcomplete_food.json            |  30 +
 Docs/TagInfo/mapcomplete_fritures.json        |  30 +
 Docs/TagInfo/mapcomplete_healthcare.json      | 142 ++++-
 Docs/TagInfo/mapcomplete_nature.json          |  44 ++
 Docs/TagInfo/mapcomplete_onwheels.json        |  72 ++-
 Docs/TagInfo/mapcomplete_personal.json        | 183 +++++-
 Docs/TagInfo/mapcomplete_pets.json            |  45 ++
 Docs/TagInfo/mapcomplete_shops.json           |  15 +
 Docs/TagInfo/mapcomplete_sports.json          |  15 +
 Docs/Themes/benches.md                        |   2 +-
 Docs/Themes/healthcare.md                     |   2 +
 Docs/Themes/personal.md                       |   2 +
 Docs/Themes/sports.md                         |   2 +-
 98 files changed, 3708 insertions(+), 453 deletions(-)
 create mode 100644 Docs/Layers/dentist.md
 create mode 100644 Docs/Layers/physiotherapist.md
 create mode 100644 Docs/Layers/sport_shops.md

diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md
index 1937b344bc..f2e39471f3 100644
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@@ -11,6 +11,7 @@
   - [Existing builtin tagrenderings](#existing-builtin-tagrenderings)
     + [images](#images)
     + [wikipedia](#wikipedia)
+    + [bench.*bench-questions](#bench*bench-questions)
     + [website](#website)
     + [phone](#phone)
     + [email](#email)
@@ -39,6 +40,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 +97,7 @@
   - climbing_route
   - crossings
   - defibrillator
+  - dentist
   - doctors
   - dogpark
   - drinking_water
@@ -119,6 +122,7 @@
   - parcel_lockers
   - parking
   - pharmacy
+  - physiotherapist
   - picnic_table
   - play_forest
   - playground
@@ -162,6 +166,17 @@
 
 
 
+### bench.*bench-questions 
+
+
+
+
+
+  - artwork
+
+
+
+
 ### website 
 
 
@@ -176,6 +191,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
+  - dentist
   - doctors
   - fitness_centre
   - food
@@ -187,6 +203,7 @@
   - nature_reserve
   - observation_tower
   - pharmacy
+  - physiotherapist
   - playground
   - recycling
   - school
@@ -212,6 +229,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
+  - dentist
   - doctors
   - fitness_centre
   - food
@@ -221,6 +239,7 @@
   - hotel
   - kindergarten_childcare
   - pharmacy
+  - physiotherapist
   - recycling
   - school
   - shops
@@ -245,6 +264,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
+  - dentist
   - doctors
   - fitness_centre
   - food
@@ -254,6 +274,7 @@
   - hotel
   - kindergarten_childcare
   - pharmacy
+  - physiotherapist
   - recycling
   - school
   - shops
@@ -277,7 +298,7 @@
   - cafe_pub
   - climbing_club
   - climbing_gym
-  - doctors
+  - dentist
   - fitness_centre
   - fitness_station
   - food
@@ -612,6 +633,18 @@
 
 
 
+### opening_hours_by_appointment 
+
+
+
+
+
+  - doctors
+  - physiotherapist
+
+
+
+
 ### multilevels 
 
 
diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index f8ad51c5f0..ac5ee1af87 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -39,6 +39,7 @@
     + [nearby-images](#nearby-images)
     + [report-contributor](#report-contributor)
     + [report-note](#report-note)
+      * [Filters](#filters)
 1. [import_candidate](#import_candidate)
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
@@ -463,7 +464,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`
 
 
 
@@ -477,6 +478,91 @@ This tagrendering has no question and is thus read-only
 
 
 
+#### Filters 
+
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+search.0 | Should mention {search} in the first comment |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+not.0 | Should <b>not</b> mention {search} in the first comment |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+opened_by.0 | Opened by contributor {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+not_opened_by.0 | <b>Not</b> opened by contributor {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+edited_by.0 | Last edited by contributor {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+not_edited_by.0 | Opened after {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+opened_before.0 | Created before {search} |  | search (date)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+opened_after.0 | Created after {search} |  | search (date)
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+anonymous.0 | Only show notes opened by an anonymous contributor | _opened_by_anonymous_user=true
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+is_open.0 | Only show open notes | 
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+no_imports.0 | All Notes (default) | 
+no_imports.1 | Hide import notes | 
+no_imports.2 | Show only import Notes | _is_import_note~.+
+
+
+
+
  import_candidate 
 ==================
 
@@ -817,6 +903,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 +950,7 @@ The following layers are included in MapComplete:
   - [parking_spaces](./Layers/parking_spaces.md)
   - [pedestrian_path](./Layers/pedestrian_path.md)
   - [pharmacy](./Layers/pharmacy.md)
+  - [physiotherapist](./Layers/physiotherapist.md)
   - [picnic_table](./Layers/picnic_table.md)
   - [play_forest](./Layers/play_forest.md)
   - [playground](./Layers/playground.md)
diff --git a/Docs/BuiltinQuestions.md b/Docs/BuiltinQuestions.md
index 57d992084d..9ab5e122c6 100644
--- a/Docs/BuiltinQuestions.md
+++ b/Docs/BuiltinQuestions.md
@@ -28,6 +28,7 @@ The following items can be easily reused in your layers
     + [description](#description)
     + [opening_hours](#opening_hours)
     + [opening_hours_24_7](#opening_hours_24_7)
+    + [opening_hours_by_appointment](#opening_hours_by_appointment)
     + [service:electricity](#serviceelectricity)
     + [payment-options](#payment-options)
     + [payment-options-advanced](#payment-options-advanced)
@@ -279,6 +280,22 @@ What are the opening hours of {title()}?
 
 
 
+### opening_hours_by_appointment 
+
+
+
+<h3>Opening hours</h3>{opening_hours_table(opening_hours)}
+
+What are the opening hours of {title()}?
+
+
+
+  - Only by appointment
+  - Only by appointment
+
+
+
+
 ### service:electricity 
 
 
diff --git a/Docs/Layers/all_streets.md b/Docs/Layers/all_streets.md
index 03367f1c28..a04a867b87 100644
--- a/Docs/Layers/all_streets.md
+++ b/Docs/Layers/all_streets.md
@@ -117,7 +117,7 @@ The question is  What sign does this bicycle road have?
   - There are no supplementary signs at this bicycle road.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DDE:244.1' target='_blank'>DE:244.1</a>`
 
 
-Only visible if  `bicycle_road=yes&_country=de`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `bicycle_road=yes&_country=de`
 
 
 
@@ -133,7 +133,7 @@ This is rendered with  This street will become a cyclestreet at {cyclestreet:sta
 
 
 
-Only visible if  `proposed:cyclestreet=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `proposed:cyclestreet=yes`
 
 
 
diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md
index 4d7e679e36..27aeaa73e8 100644
--- a/Docs/Layers/artwork.md
+++ b/Docs/Layers/artwork.md
@@ -66,6 +66,15 @@ 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/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/wikidata#values) [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/subject:wikidata#values) [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [bench](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbench) [](https://wiki.openstreetmap.org/wiki/Tag:amenity%3D)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/backrest#values) [backrest](https://wiki.openstreetmap.org/wiki/Key:backrest) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dno)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/seats#values) [seats](https://wiki.openstreetmap.org/wiki/Key:seats) | [nat](../SpecialInputElements.md#nat) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/material#values) [material](https://wiki.openstreetmap.org/wiki/Key:material) | [string](../SpecialInputElements.md#string) | [wood](https://wiki.openstreetmap.org/wiki/Tag:material%3Dwood) [metal](https://wiki.openstreetmap.org/wiki/Tag:material%3Dmetal) [stone](https://wiki.openstreetmap.org/wiki/Tag:material%3Dstone) [concrete](https://wiki.openstreetmap.org/wiki/Tag:material%3Dconcrete) [plastic](https://wiki.openstreetmap.org/wiki/Tag:material%3Dplastic) [steel](https://wiki.openstreetmap.org/wiki/Tag:material%3Dsteel)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/direction#values) [direction](https://wiki.openstreetmap.org/wiki/Key:direction) | [direction](../SpecialInputElements.md#direction) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/colour#values) [colour](https://wiki.openstreetmap.org/wiki/Key:colour) | [color](../SpecialInputElements.md#color) | [brown](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dbrown) [green](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgreen) [gray](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgray) [white](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dwhite) [red](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dred) [black](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblack) [blue](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblue) [yellow](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dyellow)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/inscription#values) [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/historic#values) [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [memorial](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D)
 
 
 
@@ -191,6 +200,226 @@ 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~.+`
+
+
+
+### doubles_as_bench 
+
+
+
+The question is  Does this artwork serve as a bench?
+
+
+
+
+
+  - This artwork also serves as a bench  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbench' target='_blank'>bench</a>`
+  - This artwork does not serve as a bench  corresponds with  ``
+  - This artwork does not serve as a bench  corresponds with  `amenity!=bench`
+  - This option cannot be chosen as answer
+
+
+
+
+### bench-backrest 
+
+
+
+The question is  Does this bench have a backrest?
+
+
+
+
+
+  - Does have a backrest  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:backrest' target='_blank'>backrest</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes' target='_blank'>yes</a>`
+  - Does <b>not</b> have a backrest  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:backrest' target='_blank'>backrest</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-seats 
+
+
+
+The question is  How many seats does this bench have?
+
+This rendering asks information about the property  [seats](https://wiki.openstreetmap.org/wiki/Key:seats) 
+
+This is rendered with  {seats} seats
+
+
+
+
+
+  - This bench does not have separated seats  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:seats:separated' target='_blank'>seats:separated</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:seats:separated%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-material 
+
+
+
+The question is  What is the bench (seating) made from?
+
+This rendering asks information about the property  [material](https://wiki.openstreetmap.org/wiki/Key:material) 
+
+This is rendered with  Material: {material}
+
+
+
+
+
+  - The seating is made from wood  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:material' target='_blank'>material</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:material%3Dwood' target='_blank'>wood</a>`
+  - The seating is made from metal  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:material' target='_blank'>material</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:material%3Dmetal' target='_blank'>metal</a>`
+  - The seating is made from stone  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:material' target='_blank'>material</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:material%3Dstone' target='_blank'>stone</a>`
+  - The seating is made from concrete  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:material' target='_blank'>material</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:material%3Dconcrete' target='_blank'>concrete</a>`
+  - The seating is made from plastic  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:material' target='_blank'>material</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:material%3Dplastic' target='_blank'>plastic</a>`
+  - The seating is made from steel  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:material' target='_blank'>material</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:material%3Dsteel' target='_blank'>steel</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-direction 
+
+
+
+The question is  In which direction are you looking when sitting on the bench?
+
+This rendering asks information about the property  [direction](https://wiki.openstreetmap.org/wiki/Key:direction) 
+
+This is rendered with  When sitting on the bench, one looks towards {direction}°.
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-colour 
+
+
+
+The question is  Which colour does this bench have?
+
+This rendering asks information about the property  [colour](https://wiki.openstreetmap.org/wiki/Key:colour) 
+
+This is rendered with  Colour: {colour}
+
+
+
+
+
+  - Colour: brown  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dbrown' target='_blank'>brown</a>`
+  - Colour: green  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgreen' target='_blank'>green</a>`
+  - Colour: gray  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgray' target='_blank'>gray</a>`
+  - Colour: white  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dwhite' target='_blank'>white</a>`
+  - Colour: red  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dred' target='_blank'>red</a>`
+  - Colour: black  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblack' target='_blank'>black</a>`
+  - Colour: blue  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblue' target='_blank'>blue</a>`
+  - Colour: yellow  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dyellow' target='_blank'>yellow</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-survey:date 
+
+
+
+The question is  When was this bench last surveyed?
+
+This rendering asks information about the property  [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) 
+
+This is rendered with  This bench was last surveyed on {survey:date}
+
+
+
+
+
+  - Surveyed today!  corresponds with  `survey:date=`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-inscription 
+
+
+
+The question is  Does this bench have an inscription?<div class='subtle text-lg'>E.g. on a mounted plaque, in the backrest, ...</div>
+
+This rendering asks information about the property  [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) 
+
+This is rendered with  This bench does have the following inscription:<br/><p><i>{inscription}</i></p>
+
+
+
+
+
+  - This bench does not have an inscription  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:not:inscription' target='_blank'>not:inscription</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:not:inscription%3Dyes' target='_blank'>yes</a>`
+  - This bench does <span class='subtle'>(probably)</span> not have an inscription  corresponds with  ``
+  - This option cannot be chosen as answer
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-memorial 
+
+
+
+The question is  Does this bench act as memorial for someone or something?
+
+
+
+
+
+  - This bench is a memorial for someone or something  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:historic' target='_blank'>historic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial' target='_blank'>memorial</a>`
+  - This bench is a <b>not</b> a memorial for someone or something  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:not:historic' target='_blank'>not:historic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:not:historic%3Dmemorial' target='_blank'>memorial</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_image.0 | With and without images (default) | 
+has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.2 | Probably does not have an image | 
+ 
 
 This document is autogenerated from [assets/layers/artwork/artwork.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/artwork/artwork.json)
\ No newline at end of file
diff --git a/Docs/Layers/barrier.md b/Docs/Layers/barrier.md
index c53fa48251..7c35016728 100644
--- a/Docs/Layers/barrier.md
+++ b/Docs/Layers/barrier.md
@@ -135,7 +135,7 @@ The question is  What kind of bollard is this?
   - Rising bollard  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bollard' target='_blank'>bollard</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bollard%3Drising' target='_blank'>rising</a>`
 
 
-Only visible if  `barrier=bollard`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `barrier=bollard`
 
 
 
@@ -155,7 +155,7 @@ The question is  What kind of cycling barrier is this?
   - Squeeze gate, gap is smaller at top, than at the bottom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycle_barrier' target='_blank'>cycle_barrier</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycle_barrier%3Dsqueeze' target='_blank'>squeeze</a>`
 
 
-Only visible if  `barrier=cycle_barrier`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `barrier=cycle_barrier`
 
 
 
@@ -185,7 +185,7 @@ This is rendered with  Space between barriers (along the length of the road): {w
 
 
 
-Only visible if  `cycle_barrier=double|cycle_barrier=triple`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier=double|cycle_barrier=triple`
 
 
 
@@ -201,7 +201,7 @@ This is rendered with  Width of opening: {width:opening} m
 
 
 
-Only visible if  `cycle_barrier=double|cycle_barrier=triple`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier=double|cycle_barrier=triple`
 
 
 
@@ -217,6 +217,6 @@ This is rendered with  Overlap: {overlap} m
 
 
 
-Only visible if  `cycle_barrier=double|cycle_barrier=triple`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier=double|cycle_barrier=triple` 
 
 This document is autogenerated from [assets/layers/barrier/barrier.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/barrier/barrier.json)
\ No newline at end of file
diff --git a/Docs/Layers/bench.md b/Docs/Layers/bench.md
index efd7493723..b002f34523 100644
--- a/Docs/Layers/bench.md
+++ b/Docs/Layers/bench.md
@@ -67,6 +67,9 @@ 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/direction#values) [direction](https://wiki.openstreetmap.org/wiki/Key:direction) | [direction](../SpecialInputElements.md#direction) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/colour#values) [colour](https://wiki.openstreetmap.org/wiki/Key:colour) | [color](../SpecialInputElements.md#color) | [brown](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dbrown) [green](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgreen) [gray](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgray) [white](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dwhite) [red](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dred) [black](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblack) [blue](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblue) [yellow](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dyellow)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/inscription#values) [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/tourism#values) [tourism](https://wiki.openstreetmap.org/wiki/Key:tourism) | Multiple choice | [artwork](https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dartwork) [](https://wiki.openstreetmap.org/wiki/Tag:tourism%3D)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/historic#values) [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [memorial](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D)
 
 
 
@@ -97,6 +100,8 @@ The question is  Does this bench have a backrest?
   - Does <b>not</b> have a backrest  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:backrest' target='_blank'>backrest</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dno' target='_blank'>no</a>`
 
 
+This tagrendering has labels  `bench-questions`
+
 
 
 ### bench-seats 
@@ -113,6 +118,13 @@ This is rendered with  {seats} seats
 
 
 
+  - This bench does not have separated seats  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:seats:separated' target='_blank'>seats:separated</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:seats:separated%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering has labels  `bench-questions`
+
+
+
 ### bench-material 
 
 
@@ -135,6 +147,8 @@ This is rendered with  Material: {material}
   - The seating is made from steel  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:material' target='_blank'>material</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:material%3Dsteel' target='_blank'>steel</a>`
 
 
+This tagrendering has labels  `bench-questions`
+
 
 
 ### bench-direction 
@@ -149,6 +163,8 @@ This is rendered with  When sitting on the bench, one looks towards {direction}
 
 
 
+This tagrendering has labels  `bench-questions`
+
 
 
 ### bench-colour 
@@ -175,6 +191,8 @@ This is rendered with  Colour: {colour}
   - Colour: yellow  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:colour' target='_blank'>colour</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:colour%3Dyellow' target='_blank'>yellow</a>`
 
 
+This tagrendering has labels  `bench-questions`
+
 
 
 ### bench-survey:date 
@@ -192,6 +210,98 @@ This is rendered with  This bench was last surveyed on {survey:date}
 
 
   - Surveyed today!  corresponds with  `survey:date=`
+
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-inscription 
+
+
+
+The question is  Does this bench have an inscription?<div class='subtle text-lg'>E.g. on a mounted plaque, in the backrest, ...</div>
+
+This rendering asks information about the property  [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) 
+
+This is rendered with  This bench does have the following inscription:<br/><p><i>{inscription}</i></p>
+
+
+
+
+
+  - This bench does not have an inscription  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:not:inscription' target='_blank'>not:inscription</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:not:inscription%3Dyes' target='_blank'>yes</a>`
+  - This bench does <span class='subtle'>(probably)</span> not have an inscription  corresponds with  ``
+  - This option cannot be chosen as answer
+
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-artwork 
+
+
+
+The question is  Does this bench have an artistic element?<div class='subtle text-lg'>E.g. it has an integrated painting, statue or other non-trivial, creative work</div>
+
+
+
+
+
+  - This bench has an integrated artwork  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:tourism' target='_blank'>tourism</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dartwork' target='_blank'>artwork</a>`
+  - This bench does not have an integrated artwork  corresponds with  ``
+
+
+
+
+### bench-memorial 
+
+
+
+The question is  Does this bench act as memorial for someone or something?
+
+
+
+
+
+  - This bench is a memorial for someone or something  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:historic' target='_blank'>historic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial' target='_blank'>memorial</a>`
+  - This bench is a <b>not</b> a memorial for someone or something  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:not:historic' target='_blank'>not:historic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:not:historic%3Dmemorial' target='_blank'>memorial</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `historic=memorial|inscription~.+|memorial=bench|tourism=artwork`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+#### Filters 
+
+
+
+
+
+| id                  | question      | osmTags            |
+|---------------------|---------------|--------------------|
+| bench_is_memorial.0 | is a memorial | historic=memorial\|memorial=bench |
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_backrest.0 | With and without backrest (default) | 
+has_backrest.1 | Has a backrest | backrest=yes
+has_backrest.2 | Has no backrest | backrest=no
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_image.0 | With and without images (default) | 
+has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.2 | Probably does not have an image | 
  
 
-This document is autogenerated from [assets/layers/bench/bench.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bench/bench.json)
\ No newline at end of file
+This document is autogenerated from [assets/layers/bench/bench.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bench/bench.json)
diff --git a/Docs/Layers/bench_at_pt.md b/Docs/Layers/bench_at_pt.md
index fbccd0888e..cf1ea59e45 100644
--- a/Docs/Layers/bench_at_pt.md
+++ b/Docs/Layers/bench_at_pt.md
@@ -40,10 +40,11 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:highway' target='_blank'>highway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:highway%3Dbus_stop' target='_blank'>bus_stop</a>
   - <a href='https://wiki.openstreetmap.org/wiki/Key:bench' target='_blank'>bench</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bench%3Dyes' target='_blank'>yes</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:bench' target='_blank'>bench</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bench%3Dstand_up_bench' target='_blank'>stand_up_bench</a>
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22bench%22%3D%22yes%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22bench%22%3D%22stand_up_bench%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%22highway%22%3D%22bus_stop%22%5D%5B%22bench%22%3D%22yes%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22highway%22%3D%22bus_stop%22%5D%5B%22bench%22%3D%22stand_up_bench%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md
index 5047a84896..0081a6a978 100644
--- a/Docs/Layers/bicycle_rental.md
+++ b/Docs/Layers/bicycle_rental.md
@@ -107,7 +107,7 @@ The question is  What kind of bicycle rental is this?
   - This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bicycle_rental' target='_blank'>bicycle_rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bicycle_rental%3Ddropoff_point' target='_blank'>dropoff_point</a>`
 
 
-Only visible if  `amenity=bicycle_rental`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bicycle_rental`
 
 
 
@@ -183,7 +183,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `shop~.+|opening_hours~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+|opening_hours~.+`
 
 
 
@@ -203,7 +203,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+`
 
 
 
@@ -269,7 +269,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*city_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -287,7 +287,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*ebike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -305,7 +305,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^(.*kid_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -323,7 +323,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*bmx.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -341,7 +341,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^(.*mtb.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -359,7 +359,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -377,7 +377,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$`
 
 This tagrendering has labels  `bicycle_rental` 
 
diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md
index 6fdf9b60ab..32293a3a77 100644
--- a/Docs/Layers/bicycle_rental_non_docking.md
+++ b/Docs/Layers/bicycle_rental_non_docking.md
@@ -106,7 +106,7 @@ The question is  What kind of bicycle rental is this?
   - This is a dropoff point, e.g. a reserved parking to place the bicycles which clearly marked as being for the rental service only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bicycle_rental' target='_blank'>bicycle_rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bicycle_rental%3Ddropoff_point' target='_blank'>dropoff_point</a>`
 
 
-Only visible if  `amenity=bicycle_rental`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bicycle_rental`
 
 
 
@@ -182,7 +182,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `shop~.+|opening_hours~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+|opening_hours~.+`
 
 
 
@@ -202,7 +202,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+`
 
 
 
@@ -268,7 +268,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*city_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -286,7 +286,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*ebike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -304,7 +304,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^(.*kid_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -322,7 +322,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*bmx.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -340,7 +340,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^(.*mtb.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -358,7 +358,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -376,7 +376,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
diff --git a/Docs/Layers/bike_cleaning.md b/Docs/Layers/bike_cleaning.md
index 8f06249766..aeef939136 100644
--- a/Docs/Layers/bike_cleaning.md
+++ b/Docs/Layers/bike_cleaning.md
@@ -117,6 +117,6 @@ This is rendered with  Using the cleaning service costs {charge}
   - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `amenity=bike_wash|amenity=bicycle_wash`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bike_wash|amenity=bicycle_wash` 
 
 This document is autogenerated from [assets/layers/bike_cleaning/bike_cleaning.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bike_cleaning/bike_cleaning.json)
\ No newline at end of file
diff --git a/Docs/Layers/bike_parking.md b/Docs/Layers/bike_parking.md
index 5663725936..4eedb31c4f 100644
--- a/Docs/Layers/bike_parking.md
+++ b/Docs/Layers/bike_parking.md
@@ -209,6 +209,6 @@ This is rendered with  This parking fits {capacity:cargo_bike} cargo bikes
 
 
 
-Only visible if  `cargo_bike~^(designated|yes)$`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `cargo_bike~^(designated|yes)$` 
 
 This document is autogenerated from [assets/layers/bike_parking/bike_parking.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bike_parking/bike_parking.json)
\ No newline at end of file
diff --git a/Docs/Layers/bike_repair_station.md b/Docs/Layers/bike_repair_station.md
index 4cbe8cfa5b..b7d09553e8 100644
--- a/Docs/Layers/bike_repair_station.md
+++ b/Docs/Layers/bike_repair_station.md
@@ -120,7 +120,7 @@ The question is  Is the bike pump still operational?
   - The bike pump is operational  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump:operational_status' target='_blank'>service:bicycle:pump:operational_status</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump:operational_status%3Doperational' target='_blank'>operational</a>`
 
 
-Only visible if  `service:bicycle:pump=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:pump=yes`
 
 
 
@@ -226,7 +226,7 @@ The question is  Does this bike repair station have a special tool to repair you
   - There is no chain tool  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:chain_tool' target='_blank'>service:bicycle:chain_tool</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:chain_tool%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `service:bicycle:tools=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:tools=yes`
 
 
 
@@ -244,7 +244,7 @@ The question is  Does this bike station have a hook to hang your bike on or a st
   - There is no hook or stand  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:stand' target='_blank'>service:bicycle:stand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:stand%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `service:bicycle:tools=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:tools=yes`
 
 
 
@@ -256,7 +256,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `email~.+&service:bicycle:pump:operational_status=broken`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `email~.+&service:bicycle:pump:operational_status=broken`
 
 
 
@@ -295,7 +295,7 @@ The question is  Is this an electric bike pump?
   - Electrical pump  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:manual' target='_blank'>manual</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:manual%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `service:bicycle:pump=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:pump=yes`
 
 
 
@@ -314,7 +314,7 @@ The question is  Does the pump have a pressure indicator or manometer?
   - There is manometer but it is broken  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:manometer' target='_blank'>manometer</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:manometer%3Dbroken' target='_blank'>broken</a>`
 
 
-Only visible if  `service:bicycle:pump=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:pump=yes`
 
 
 
diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md
index a4555c4662..349d10445d 100644
--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
@@ -113,7 +113,7 @@ This tagrendering has no question and is thus read-only
   - This business focuses on rental  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental' target='_blank'>rental</a>`
 
 
-Only visible if  `shop~.+&shop!~^(bicycle)$&shop!~^(sports)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~.+&shop!~^(bicycle)$&shop!~^(sports)$`
 
 
 
@@ -309,7 +309,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*city_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -327,7 +327,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*ebike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -345,7 +345,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^(.*kid_bike.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -363,7 +363,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^(.*bmx.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -381,7 +381,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^(.*mtb.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -399,7 +399,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -417,7 +417,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$`
 
 This tagrendering has labels  `bicycle_rental`
 
diff --git a/Docs/Layers/birdhide.md b/Docs/Layers/birdhide.md
index 5be27ad09e..636313e85a 100644
--- a/Docs/Layers/birdhide.md
+++ b/Docs/Layers/birdhide.md
@@ -132,6 +132,26 @@ This is rendered with  Operated by {operator}
 
   - Operated by Natuurpunt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:operator' target='_blank'>operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:operator%3DNatuurpunt' target='_blank'>Natuurpunt</a>`
   - Operated by the Agency for Nature and Forests  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:operator' target='_blank'>operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:operator%3DAgentschap Natuur en Bos' target='_blank'>Agentschap Natuur en Bos</a>`
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+wheelchair.0 | Wheelchair accessible | wheelchair=yes\|wheelchair=designated|wheelchair=permissive
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+shelter.0 | Only covered birdhides | shelter=yes\|building~.+&covered!=no
  
 
 This document is autogenerated from [assets/layers/birdhide/birdhide.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/birdhide/birdhide.json)
\ No newline at end of file
diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md
index 961f9affdf..561dfa4a9c 100644
--- a/Docs/Layers/cafe_pub.md
+++ b/Docs/Layers/cafe_pub.md
@@ -348,7 +348,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -369,7 +369,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
@@ -381,6 +381,33 @@ Shows the reviews module (including the possibility to leave a review)
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
  
 
 This document is autogenerated from [assets/layers/cafe_pub/cafe_pub.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/cafe_pub/cafe_pub.json)
\ No newline at end of file
diff --git a/Docs/Layers/caravansites.md b/Docs/Layers/caravansites.md
index b7f1e40567..920c3feea8 100644
--- a/Docs/Layers/caravansites.md
+++ b/Docs/Layers/caravansites.md
@@ -131,7 +131,7 @@ This is rendered with  This place charges {charge}
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -197,7 +197,7 @@ The question is  Do you have to pay for the internet access?
   - You do not need to pay extra for internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `internet_access=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=yes`
 
 
 
diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md
index 1ff47b5e8c..36648380ba 100644
--- a/Docs/Layers/charging_station.md
+++ b/Docs/Layers/charging_station.md
@@ -309,7 +309,7 @@ This is rendered with  There are <b class='text-xl'>{socket:schuko}</b> plugs of
 
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 
 
@@ -325,7 +325,7 @@ This is rendered with  There are <b class='text-xl'>{socket:typee}</b> plugs of
 
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 
 
@@ -341,7 +341,7 @@ This is rendered with  There are <b class='text-xl'>{socket:chademo}</b> plugs o
 
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 
 
@@ -357,7 +357,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_cable}</b> plu
 
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 
 
@@ -373,7 +373,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1}</b> plugs of
 
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 
 
@@ -389,7 +389,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_combo}</b> plu
 
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 
 
@@ -405,7 +405,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger}<
 
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 
 
@@ -421,7 +421,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2}</b> plugs of
 
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 
 
@@ -437,7 +437,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_combo}</b> plu
 
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 
 
@@ -453,7 +453,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_cable}</b> plu
 
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 
 
@@ -469,7 +469,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger_c
 
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 
 
@@ -485,7 +485,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -501,7 +501,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -517,7 +517,7 @@ This is rendered with  There are <b class='text-xl'>{socket:USB-A}</b> plugs of
 
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 
 
@@ -533,7 +533,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_3pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 
 
@@ -549,7 +549,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_5pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 
 
@@ -570,7 +570,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:voltage' target='_blank'>socket:schuko:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -593,7 +593,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:current' target='_blank'>socket:schuko:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -616,7 +616,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 3.6 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:output' target='_blank'>socket:schuko:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:output%3D3.6 kW' target='_blank'>3.6 kW</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -639,7 +639,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:voltage' target='_blank'>socket:typee:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -662,7 +662,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:current' target='_blank'>socket:typee:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -686,7 +686,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:output' target='_blank'>socket:typee:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -709,7 +709,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs 500 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:voltage' target='_blank'>socket:chademo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:voltage%3D500 V' target='_blank'>500 V</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -732,7 +732,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 120 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:current' target='_blank'>socket:chademo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:current%3D120 A' target='_blank'>120 A</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -755,7 +755,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:output' target='_blank'>socket:chademo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -779,7 +779,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:voltage' target='_blank'>socket:type1_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -802,7 +802,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:current' target='_blank'>socket:type1_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -826,7 +826,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 7 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:output' target='_blank'>socket:type1_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:output%3D7 kW' target='_blank'>7 kW</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -850,7 +850,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:voltage' target='_blank'>socket:type1:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -873,7 +873,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:current' target='_blank'>socket:type1:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -899,7 +899,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7.2 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:output' target='_blank'>socket:type1:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:output%3D7.2 kW' target='_blank'>7.2 kW</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -923,7 +923,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs 1000 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:voltage' target='_blank'>socket:type1_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:voltage%3D1000 V' target='_blank'>1000 V</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -947,7 +947,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 125 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:current' target='_blank'>socket:type1_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:current%3D125 A' target='_blank'>125 A</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -973,7 +973,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 350 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:output' target='_blank'>socket:type1_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:output%3D350 kW' target='_blank'>350 kW</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -996,7 +996,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:voltage' target='_blank'>socket:tesla_supercharger:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1020,7 +1020,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:current' target='_blank'>socket:tesla_supercharger:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1045,7 +1045,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:output' target='_blank'>socket:tesla_supercharger:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1069,7 +1069,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:voltage' target='_blank'>socket:type2:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1093,7 +1093,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:current' target='_blank'>socket:type2:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1117,7 +1117,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:output' target='_blank'>socket:type2:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1141,7 +1141,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:voltage' target='_blank'>socket:type2_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1165,7 +1165,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:current' target='_blank'>socket:type2_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1188,7 +1188,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:output' target='_blank'>socket:type2_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1212,7 +1212,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:voltage' target='_blank'>socket:type2_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1236,7 +1236,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:current' target='_blank'>socket:type2_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1260,7 +1260,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:output' target='_blank'>socket:type2_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1284,7 +1284,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:voltage' target='_blank'>socket:tesla_supercharger_ccs:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1308,7 +1308,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded type2_css) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:current' target='_blank'>socket:tesla_supercharger_ccs:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1331,7 +1331,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:output' target='_blank'>socket:tesla_supercharger_ccs:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1354,7 +1354,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1378,7 +1378,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1403,7 +1403,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1427,7 +1427,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1451,7 +1451,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1475,7 +1475,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1498,7 +1498,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs 5 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:voltage' target='_blank'>socket:USB-A:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:voltage%3D5 V' target='_blank'>5 V</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1522,7 +1522,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 2 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:current' target='_blank'>socket:USB-A:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:current%3D2 A' target='_blank'>2 A</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1546,7 +1546,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 10w A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:output' target='_blank'>socket:USB-A:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:output%3D10W' target='_blank'>10W</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1569,7 +1569,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1592,7 +1592,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1615,7 +1615,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1638,7 +1638,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1661,7 +1661,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1684,7 +1684,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1741,7 +1741,7 @@ This is rendered with  Using this charging station costs <b>{charge}</b>
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -1765,7 +1765,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:membership_card' target='_blank'>payment:membership_card</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:membership_card%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes|charge~.+`
 
 
 
@@ -1811,7 +1811,7 @@ This is rendered with  Authenticate by calling or SMS'ing to <a href='tel:{authe
 
 
 
-Only visible if  `authentication:phone_call=yes|authentication:short_message=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `authentication:phone_call=yes|authentication:short_message=yes`
 
 
 
@@ -1832,7 +1832,7 @@ This is rendered with  One can stay at most <b>{canonical(maxstay)}</b>
   - No timelimit on leaving your vehicle here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>`
 
 
-Only visible if  `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`
 
 
 
@@ -1961,7 +1961,7 @@ This is rendered with  Reference number is <b>{ref}</b>
 
 
 
-Only visible if  `network~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `network~.+`
 
 
 
@@ -2018,6 +2018,51 @@ This tagrendering has no question and is thus read-only
 
 
 
-This tagrendering is part of group  `technical` 
+This tagrendering is part of group  `technical`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+vehicle-type.0 | All vehicle types (default) | 
+vehicle-type.1 | Charging station for bicycles | bicycle=yes
+vehicle-type.2 | Charging station for cars | car=yes\|motorcar=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+working.0 | Only working charging stations | operational_status!=broken&amenity=charging_station
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+connection_type.0 | All connectors (default) | 
+connection_type.1 | Has a <div style='display: inline-block'><b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div> connector | socket:schuko~.+
+connection_type.2 | Has a <div style='display: inline-block'><b><b>European wall plug</b> with ground pin (CEE7/4 type E)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div> connector | socket:typee~.+
+connection_type.3 | Has a <div style='display: inline-block'><b><b>Chademo</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Chademo_type4.svg'/></div> connector | socket:chademo~.+
+connection_type.4 | Has a <div style='display: inline-block'><b><b>Type 1 with cable</b> (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div> connector | socket:type1_cable~.+
+connection_type.5 | Has a <div style='display: inline-block'><b>Type 1 <i>without</i> cable (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1_J1772.svg'/></div> connector | socket:type1~.+
+connection_type.6 | Has a <div style='display: inline-block'><b>Type 1 CCS (aka Type 1 Combo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type1-ccs.svg'/></div> connector | socket:type1_combo~.+
+connection_type.7 | Has a <div style='display: inline-block'><b><b>Tesla Supercharger</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div> connector | socket:tesla_supercharger~.+
+connection_type.8 | Has a <div style='display: inline-block'><b><b>Type 2</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_socket.svg'/></div> connector | socket:type2~.+
+connection_type.9 | Has a <div style='display: inline-block'><b><b>Type 2 CCS</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> connector | socket:type2_combo~.+
+connection_type.10 | Has a <div style='display: inline-block'><b><b>Type 2 with cable</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> connector | socket:type2_cable~.+
+connection_type.11 | Has a <div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (a branded type2_css)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> connector | socket:tesla_supercharger_ccs~.+
+connection_type.12 | Has a <div style='display: inline-block'><b><b>Tesla Supercharger (destination)</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div> connector | socket:tesla_destination~.+
+connection_type.13 | Has a <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> connector | socket:tesla_destination~.+
+connection_type.14 | Has a <div style='display: inline-block'><b><b>USB</b> to charge phones and small electronics</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/usb_port.svg'/></div> connector | socket:USB-A~.+
+connection_type.15 | Has a <div style='display: inline-block'><b><b>Bosch Active Connect with 3 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-3pin.svg'/></div> connector | socket:bosch_3pin~.+
+connection_type.16 | Has a <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> connector | socket:bosch_5pin~.+
+ 
 
 This document is autogenerated from [assets/layers/charging_station/charging_station.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/charging_station/charging_station.json)
\ No newline at end of file
diff --git a/Docs/Layers/charging_station_ebikes.md b/Docs/Layers/charging_station_ebikes.md
index e2cc0a5bcd..28b0c919b0 100644
--- a/Docs/Layers/charging_station_ebikes.md
+++ b/Docs/Layers/charging_station_ebikes.md
@@ -308,7 +308,7 @@ This is rendered with  There are <b class='text-xl'>{socket:schuko}</b> plugs of
 
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 
 
@@ -324,7 +324,7 @@ This is rendered with  There are <b class='text-xl'>{socket:typee}</b> plugs of
 
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 
 
@@ -340,7 +340,7 @@ This is rendered with  There are <b class='text-xl'>{socket:chademo}</b> plugs o
 
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 
 
@@ -356,7 +356,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_cable}</b> plu
 
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 
 
@@ -372,7 +372,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1}</b> plugs of
 
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 
 
@@ -388,7 +388,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_combo}</b> plu
 
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 
 
@@ -404,7 +404,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger}<
 
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 
 
@@ -420,7 +420,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2}</b> plugs of
 
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 
 
@@ -436,7 +436,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_combo}</b> plu
 
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 
 
@@ -452,7 +452,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_cable}</b> plu
 
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 
 
@@ -468,7 +468,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger_c
 
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 
 
@@ -484,7 +484,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -500,7 +500,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 
 
@@ -516,7 +516,7 @@ This is rendered with  There are <b class='text-xl'>{socket:USB-A}</b> plugs of
 
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 
 
@@ -532,7 +532,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_3pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 
 
@@ -548,7 +548,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_5pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 
 
@@ -569,7 +569,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:voltage' target='_blank'>socket:schuko:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -592,7 +592,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:current' target='_blank'>socket:schuko:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -615,7 +615,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 3.6 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:output' target='_blank'>socket:schuko:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:output%3D3.6 kW' target='_blank'>3.6 kW</a>`
 
 
-Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:schuko~.+&socket:schuko!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -638,7 +638,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:voltage' target='_blank'>socket:typee:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -661,7 +661,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:current' target='_blank'>socket:typee:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -685,7 +685,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:output' target='_blank'>socket:typee:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:typee~.+&socket:typee!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -708,7 +708,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs 500 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:voltage' target='_blank'>socket:chademo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:voltage%3D500 V' target='_blank'>500 V</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -731,7 +731,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 120 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:current' target='_blank'>socket:chademo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:current%3D120 A' target='_blank'>120 A</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -754,7 +754,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:output' target='_blank'>socket:chademo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:chademo~.+&socket:chademo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -778,7 +778,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:voltage' target='_blank'>socket:type1_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -801,7 +801,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:current' target='_blank'>socket:type1_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -825,7 +825,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 7 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:output' target='_blank'>socket:type1_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:output%3D7 kW' target='_blank'>7 kW</a>`
 
 
-Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_cable~.+&socket:type1_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -849,7 +849,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:voltage' target='_blank'>socket:type1:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -872,7 +872,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:current' target='_blank'>socket:type1:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -898,7 +898,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7.2 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:output' target='_blank'>socket:type1:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:output%3D7.2 kW' target='_blank'>7.2 kW</a>`
 
 
-Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1~.+&socket:type1!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -922,7 +922,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs 1000 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:voltage' target='_blank'>socket:type1_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:voltage%3D1000 V' target='_blank'>1000 V</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -946,7 +946,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 125 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:current' target='_blank'>socket:type1_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:current%3D125 A' target='_blank'>125 A</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -972,7 +972,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 350 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:output' target='_blank'>socket:type1_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:output%3D350 kW' target='_blank'>350 kW</a>`
 
 
-Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type1_combo~.+&socket:type1_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -995,7 +995,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:voltage' target='_blank'>socket:tesla_supercharger:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1019,7 +1019,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:current' target='_blank'>socket:tesla_supercharger:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1044,7 +1044,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:output' target='_blank'>socket:tesla_supercharger:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1068,7 +1068,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:voltage' target='_blank'>socket:type2:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1092,7 +1092,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:current' target='_blank'>socket:type2:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1116,7 +1116,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:output' target='_blank'>socket:type2:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2~.+&socket:type2!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1140,7 +1140,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:voltage' target='_blank'>socket:type2_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1164,7 +1164,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:current' target='_blank'>socket:type2_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1187,7 +1187,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:output' target='_blank'>socket:type2_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_combo~.+&socket:type2_combo!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1211,7 +1211,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:voltage' target='_blank'>socket:type2_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1235,7 +1235,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:current' target='_blank'>socket:type2_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1259,7 +1259,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:output' target='_blank'>socket:type2_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:type2_cable~.+&socket:type2_cable!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1283,7 +1283,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:voltage' target='_blank'>socket:tesla_supercharger_ccs:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1307,7 +1307,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded type2_css) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:current' target='_blank'>socket:tesla_supercharger_ccs:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1330,7 +1330,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:output' target='_blank'>socket:tesla_supercharger_ccs:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1353,7 +1353,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1377,7 +1377,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1402,7 +1402,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1426,7 +1426,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1450,7 +1450,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1474,7 +1474,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:tesla_destination~.+&socket:tesla_destination!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1497,7 +1497,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs 5 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:voltage' target='_blank'>socket:USB-A:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:voltage%3D5 V' target='_blank'>5 V</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1521,7 +1521,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 2 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:current' target='_blank'>socket:USB-A:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:current%3D2 A' target='_blank'>2 A</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1545,7 +1545,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 10w A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:output' target='_blank'>socket:USB-A:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:output%3D10W' target='_blank'>10W</a>`
 
 
-Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:USB-A~.+&socket:USB-A!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1568,7 +1568,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1591,7 +1591,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1614,7 +1614,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_3pin~.+&socket:bosch_3pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1637,7 +1637,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1660,7 +1660,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1683,7 +1683,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `socket:bosch_5pin~.+&socket:bosch_5pin!=0`
 
 This tagrendering is part of group  `technical`
 
@@ -1740,7 +1740,7 @@ This is rendered with  Using this charging station costs <b>{charge}</b>
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -1764,7 +1764,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:membership_card' target='_blank'>payment:membership_card</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:membership_card%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes|charge~.+`
 
 
 
@@ -1810,7 +1810,7 @@ This is rendered with  Authenticate by calling or SMS'ing to <a href='tel:{authe
 
 
 
-Only visible if  `authentication:phone_call=yes|authentication:short_message=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `authentication:phone_call=yes|authentication:short_message=yes`
 
 
 
@@ -1831,7 +1831,7 @@ This is rendered with  One can stay at most <b>{canonical(maxstay)}</b>
   - No timelimit on leaving your vehicle here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>`
 
 
-Only visible if  `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`
 
 
 
@@ -1960,7 +1960,7 @@ This is rendered with  Reference number is <b>{ref}</b>
 
 
 
-Only visible if  `network~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `network~.+`
 
 
 
diff --git a/Docs/Layers/climbing.md b/Docs/Layers/climbing.md
index 5395a8486c..16d4239da3 100644
--- a/Docs/Layers/climbing.md
+++ b/Docs/Layers/climbing.md
@@ -77,7 +77,7 @@ This is rendered with  <a href='{url}' target='_blank'>{url}</a>
 
 
 
-Only visible if  `leisure!~^(sports_centre)$&sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `leisure!~^(sports_centre)$&sport=climbing`
 
 
 
@@ -121,7 +121,7 @@ This is rendered with  The highest grade is {climbing:grade:french:max} accordin
 
 
 
-Only visible if  `climbing!~^(route)$&climbing:sport=yes|sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing!~^(route)$&climbing:sport=yes|sport=climbing`
 
 
 
diff --git a/Docs/Layers/climbing_area.md b/Docs/Layers/climbing_area.md
index 7703d37178..85a79e37cf 100644
--- a/Docs/Layers/climbing_area.md
+++ b/Docs/Layers/climbing_area.md
@@ -125,7 +125,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_contained_climbing_routes~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_contained_climbing_routes~.+`
 
 
 
@@ -182,7 +182,7 @@ This is rendered with  The rock type is {rock}
   - Limestone  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:rock' target='_blank'>rock</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rock%3Dlimestone' target='_blank'>limestone</a>`
 
 
-Only visible if  `climbing=crag|natural=cliff|natural=bare_rock`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing=crag|natural=cliff|natural=bare_rock`
 
 
 
@@ -198,7 +198,7 @@ This is rendered with  <a href='{url}' target='_blank'>{url}</a>
 
 
 
-Only visible if  `leisure!~^(sports_centre)$&sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `leisure!~^(sports_centre)$&sport=climbing`
 
 
 
diff --git a/Docs/Layers/climbing_gym.md b/Docs/Layers/climbing_gym.md
index e7b96cf869..ee66fbf259 100644
--- a/Docs/Layers/climbing_gym.md
+++ b/Docs/Layers/climbing_gym.md
@@ -238,7 +238,7 @@ This is rendered with  The highest grade is {climbing:grade:french:max} accordin
 
 
 
-Only visible if  `climbing!~^(route)$&climbing:sport=yes|sport=climbing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing!~^(route)$&climbing:sport=yes|sport=climbing`
 
 
 
@@ -291,7 +291,7 @@ This is rendered with  The sport climbing routes here have at most {climbing:bol
 
 
 
-Only visible if  `climbing:sport=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `climbing:sport=yes`
 
 
 
diff --git a/Docs/Layers/climbing_opportunity.md b/Docs/Layers/climbing_opportunity.md
index aebe827677..fd5a6fa41f 100644
--- a/Docs/Layers/climbing_opportunity.md
+++ b/Docs/Layers/climbing_opportunity.md
@@ -63,7 +63,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `name~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `name~.+`
 
 
 
diff --git a/Docs/Layers/crossings.md b/Docs/Layers/crossings.md
index d1e064ff44..aaf88c1069 100644
--- a/Docs/Layers/crossings.md
+++ b/Docs/Layers/crossings.md
@@ -109,7 +109,7 @@ The question is  What kind of crossing is this?
   - Crossing without crossing markings  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:crossing' target='_blank'>crossing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing%3Dunmarked' target='_blank'>unmarked</a>`
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -127,7 +127,7 @@ The question is  Is this is a zebra crossing?
   - This is not a zebra crossing  corresponds with  ``
 
 
-Only visible if  `crossing=uncontrolled`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=uncontrolled`
 
 
 
@@ -145,7 +145,7 @@ The question is  Is this crossing also for bicycles?
   - A cyclist can not use this crossing  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:bicycle' target='_blank'>bicycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bicycle%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -163,7 +163,7 @@ The question is  Does this crossing have an island in the middle?
   - This crossing does not have an island in the middle  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:crossing:island' target='_blank'>crossing:island</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:crossing:island%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -183,7 +183,7 @@ The question is  Does this crossing have tactile paving?
   - This option cannot be chosen as answer
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
@@ -201,7 +201,7 @@ The question is  Does this traffic light have a button to request green light?
   - This traffic light does not have a button to request green light  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:button_operated' target='_blank'>button_operated</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:button_operated%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=traffic_signals|crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=traffic_signals|crossing=traffic_signals`
 
 
 
@@ -221,7 +221,7 @@ The question is  Does this traffic light have sound signals to aid crossing?
   - This traffic light has a sound signal to sign that it is safe to cross, but no signal to help locate the pole.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:sound' target='_blank'>traffic_signals:sound</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:sound%3Dwalk' target='_blank'>walk</a>`
 
 
-Only visible if  `crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals`
 
 
 
@@ -239,7 +239,7 @@ The question is  Does this traffic light have vibration signals to aid crossing?
   - The button for this traffic light does not have a vibration signal to indicate that it is safe to cross.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:vibration' target='_blank'>traffic_signals:vibration</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:vibration%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `crossing=traffic_signals&button_operated=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals&button_operated=yes`
 
 
 
@@ -257,7 +257,7 @@ The question is  Does this traffic light have an arrow pointing in the direction
   - This traffic light does <b>not</b> have an arrow pointing in the direction of crossing.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:arrow' target='_blank'>traffic_signals:arrow</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:arrow%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals`
 
 
 
@@ -275,7 +275,7 @@ The question is  Does this traffic light have a tactile map showing the layout o
   - This traffic light does <b>not</b> have a tactile map showing the layout of the crossing.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_signals:minimap' target='_blank'>traffic_signals:minimap</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_signals:minimap%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `crossing=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `crossing=traffic_signals`
 
 
 
@@ -294,7 +294,7 @@ The question is  Can a cyclist turn right when the light is red?
   - A cyclist can not turn right if the light is red  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:red_turn:right:bicycle' target='_blank'>red_turn:right:bicycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:red_turn:right:bicycle%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `highway=traffic_signals`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=traffic_signals`
 
 
 
@@ -313,6 +313,22 @@ 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`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+tactile_paving_advanced.0 | With or without tactile paving (default) | 
+tactile_paving_advanced.1 | With tactile paving | tactile_paving=yes
+tactile_paving_advanced.2 | Without tactile paving | tactile_paving=no
+tactile_paving_advanced.3 | No information about tactile paving | 
+ 
 
 This document is autogenerated from [assets/layers/crossings/crossings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/crossings/crossings.json)
\ No newline at end of file
diff --git a/Docs/Layers/cultural_places_without_etymology.md b/Docs/Layers/cultural_places_without_etymology.md
index 1a3cdab8df..d7a93a481c 100644
--- a/Docs/Layers/cultural_places_without_etymology.md
+++ b/Docs/Layers/cultural_places_without_etymology.md
@@ -98,6 +98,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -167,6 +169,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/cycleways_and_roads.md b/Docs/Layers/cycleways_and_roads.md
index 0e384bbc6a..c5dcb67814 100644
--- a/Docs/Layers/cycleways_and_roads.md
+++ b/Docs/Layers/cycleways_and_roads.md
@@ -197,7 +197,7 @@ This is rendered with  This cyleway is made of {cycleway:surface}
   - This cycleway is made from raw ground  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:surface' target='_blank'>cycleway:surface</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:surface%3Dground' target='_blank'>ground</a>`
 
 
-Only visible if  `cycleway=shared_lane|cycleway=lane|cycleway=track`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=shared_lane|cycleway=lane|cycleway=track`
 
 
 
@@ -221,7 +221,7 @@ The question is  What is the smoothness of this cycleway?
   - Impassable / No wheeled vehicle  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:smoothness' target='_blank'>cycleway:smoothness</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:smoothness%3Dimpassable' target='_blank'>impassable</a>`
 
 
-Only visible if  `cycleway=shared_lane|cycleway=lane|cycleway=track`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=shared_lane|cycleway=lane|cycleway=track`
 
 
 
@@ -279,7 +279,7 @@ The question is  What is the smoothness of this street?
   - Impassable / No wheeled vehicle  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:smoothness' target='_blank'>smoothness</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:smoothness%3Dimpassable' target='_blank'>impassable</a>`
 
 
-Only visible if  `cycleway=no|highway=cycleway`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=no|highway=cycleway`
 
 
 
@@ -315,7 +315,7 @@ The question is  What traffic sign does this cycleway have?
   - No traffic sign present  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign' target='_blank'>cycleway:traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign%3Dnone' target='_blank'>none</a>`
 
 
-Only visible if  `cycleway=lane|cycleway=track&_country=be`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=lane|cycleway=track&_country=be`
 
 
 
@@ -340,7 +340,7 @@ The question is  What traffic sign does this cycleway have?
   - No traffic sign present  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dnone' target='_blank'>none</a>`
 
 
-Only visible if  `highway=cycleway|highway=path&_country=be|_country=nl`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=cycleway|highway=path&_country=be|_country=nl`
 
 
 
@@ -363,7 +363,7 @@ The question is  Does the traffic sign D7 (<img src='./assets/layers/cycleways_a
   - No supplementary traffic sign present  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign:supplementary' target='_blank'>cycleway:traffic_sign:supplementary</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign:supplementary%3Dnone' target='_blank'>none</a>`
 
 
-Only visible if  `cycleway:traffic_sign=BE:D7|cycleway:traffic_sign~^(BE:D7;.*)$`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway:traffic_sign=BE:D7|cycleway:traffic_sign~^(BE:D7;.*)$`
 
 
 
@@ -379,7 +379,7 @@ This is rendered with  The buffer besides this cycleway is {cycleway:buffer} m
 
 
 
-Only visible if  `cycleway=track|cycleway=lane`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=track|cycleway=lane`
 
 
 
@@ -399,7 +399,7 @@ The question is  How is this cycleway separated from the road?
   - This cycleway is separated by a kerb  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:separation' target='_blank'>cycleway:separation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:separation%3Dkerb' target='_blank'>kerb</a>`
 
 
-Only visible if  `cycleway=track|cycleway=lane`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cycleway=track|cycleway=lane`
 
 
 
@@ -419,6 +419,6 @@ The question is  How is this cycleway separated from the road?
   - This cycleway is separated by a kerb  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:separation' target='_blank'>separation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:separation%3Dkerb' target='_blank'>kerb</a>`
 
 
-Only visible if  `highway=cycleway|highway=path`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `highway=cycleway|highway=path` 
 
 This document is autogenerated from [assets/layers/cycleways_and_roads/cycleways_and_roads.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/cycleways_and_roads/cycleways_and_roads.json)
\ No newline at end of file
diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md
index 1a99e1fa70..d8f17f990c 100644
--- a/Docs/Layers/defibrillator.md
+++ b/Docs/Layers/defibrillator.md
@@ -150,7 +150,7 @@ The question is  Is this a a regular automatic defibrillator or a manual defibri
   - This option cannot be chosen as answer
 
 
-Only visible if  `access=no`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=no`
 
 
 
@@ -172,7 +172,7 @@ This is rendered with  This defibrillator is on floor {level}
   - This defibrillator is on the <b>first floor</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D1' target='_blank'>1</a>`
 
 
-Only visible if  `indoor=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=yes`
 
 
 
@@ -340,6 +340,28 @@ This rendering asks information about the property  [fixme](https://wiki.openstr
 
 This is rendered with  Extra information for OpenStreetMap experts: {fixme}
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_image.0 | With and without images (default) | 
+has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.2 | Probably does not have an image | 
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/defibrillator/defibrillator.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/defibrillator/defibrillator.json)
\ No newline at end of file
diff --git a/Docs/Layers/dentist.md b/Docs/Layers/dentist.md
new file mode 100644
index 0000000000..15cb5efb44
--- /dev/null
+++ b/Docs/Layers/dentist.md
@@ -0,0 +1,183 @@
+
+
+ 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}
+
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+ 
+
+This document is autogenerated from [assets/layers/dentist/dentist.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/dentist/dentist.json)
\ No newline at end of file
diff --git a/Docs/Layers/doctors.md b/Docs/Layers/doctors.md
index 003dccffb0..828f5b35fc 100644
--- a/Docs/Layers/doctors.md
+++ b/Docs/Layers/doctors.md
@@ -7,7 +7,7 @@
 
 <img src='https://mapcomplete.osm.be/circle:white;./assets/layers/doctors/doctors.svg' height="100px"> 
 
-This layer shows doctor offices, dentists and other healthcare facilities
+This layer shows doctor offices
 
 
 
@@ -41,10 +41,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Ddoctors' target='_blank'>doctors</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Ddentist' target='_blank'>dentist</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:healthcare' target='_blank'>healthcare</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:healthcare%3Dphysiotherapist' target='_blank'>physiotherapist</a>
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Ddoctors' target='_blank'>doctors</a>
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22doctors%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22dentist%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22healthcare%22%3D%22physiotherapist%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22doctors%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -61,11 +61,11 @@ this quick overview is incomplete
 
 attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | ["by appointment"](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment")
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/healthcare:speciality#values) [healthcare:speciality](https://wiki.openstreetmap.org/wiki/Key:healthcare:speciality) | [string](../SpecialInputElements.md#string) | [general](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dgeneral) [gynaecology](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dgynaecology) [psychiatry](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dpsychiatry) [paediatrics](https://wiki.openstreetmap.org/wiki/Tag:healthcare:speciality%3Dpaediatrics)
 
 
@@ -83,7 +83,21 @@ This tagrendering has no question and is thus read-only
 
 
 
-### opening_hours 
+### name 
+
+
+
+The question is  What is the name of this doctors place?
+
+This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
+
+This is rendered with  This doctors place is called {name}
+
+
+
+
+
+### opening_hours_by_appointment 
 
 
 
@@ -97,6 +111,13 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
+  - Only by appointment  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:opening_hours' target='_blank'>opening_hours</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment"' target='_blank'>"by appointment"</a>`
+  - Only by appointment  corresponds with  `opening_hours~^("by appointment"|by appointment)$`
+  - This option cannot be chosen as answer
+
+
+
+
 ### phone 
 
 
@@ -157,20 +178,6 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-### name 
-
-
-
-The question is  What is the name of this doctors place?
-
-This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
-
-This is rendered with  This doctors place is called {name}
-
-
-
-
-
 ### specialty 
 
 
@@ -191,6 +198,17 @@ 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 
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+ 
 
 This document is autogenerated from [assets/layers/doctors/doctors.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/doctors/doctors.json)
\ No newline at end of file
diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md
index 74b4df3263..737a001124 100644
--- a/Docs/Layers/dogfoodb.md
+++ b/Docs/Layers/dogfoodb.md
@@ -74,8 +74,10 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:halal#values) [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/friture:oil#values) [friture:oil](https://wiki.openstreetmap.org/wiki/Key:friture:oil) | Multiple choice | [vegetable](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Dvegetable) [animal](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/reusable_packaging:accept#values) [reusable_packaging:accept](https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno)
@@ -384,6 +386,23 @@ The question is  Does this restaurant offer a halal menu?
 
 
 
+### organic (no friture) 
+
+
+
+The question is  Does this restaurant offer organic food?
+
+
+
+
+
+  - There are no organic options available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - There is an organic menu  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - Only organic options are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+
+
 ### friture-vegetarian 
 
 
@@ -399,7 +418,7 @@ The question is  Does this fries shop have vegetarian snacks?
   - No vegetarian snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -418,7 +437,26 @@ The question is  Does this fries shop have vegan snacks?
   - No vegan snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
+
+
+
+### friture-organic 
+
+
+
+The question is  Does this fries shop offer organic snacks?
+
+
+
+
+
+  - Organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - No organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - Only organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -436,7 +474,7 @@ The question is  Does this fries shop use vegetable or animal oil for cooking?
   - The frying is done with animal oil  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:friture:oil' target='_blank'>friture:oil</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal' target='_blank'>animal</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -455,7 +493,7 @@ The question is  If you bring your own container (such as a cooking pot and smal
   - You <b>must</b> bring your own container to order here.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept' target='_blank'>reusable_packaging:accept</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly' target='_blank'>only</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -530,7 +568,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -551,7 +589,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
@@ -587,6 +625,61 @@ Shows a small map with the feature. Added by default to every popup
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+vegetarian.0 | Has a vegetarian menu | diet:vegetarian=yes\|diet:vegetarian=only|diet:vegan=yes|diet:vegan=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+vegan.0 | Has a vegan menu | diet:vegan=yes\|diet:vegan=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+halal.0 | Has a halal menu | diet:halal=yes\|diet:halal=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_organic.0 | Has organic options | organic=yes\|organic=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
  
 
 This document is autogenerated from [assets/themes/pets/pets.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/pets/pets.json)
\ No newline at end of file
diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md
index 14f3241397..129e7ec7b9 100644
--- a/Docs/Layers/dogshop.md
+++ b/Docs/Layers/dogshop.md
@@ -70,6 +70,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno)
 
 
 
@@ -417,7 +418,7 @@ The question is  What paper formats does this shop offer?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`
 
 
 
@@ -456,7 +457,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -477,7 +478,26 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
+
+
+
+### organic 
+
+
+
+The question is  Does this shop offer organic products?
+
+
+
+
+
+  - This shop offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - This shop only offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+  - This shop does not offer organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist`
 
 
 
@@ -523,6 +543,54 @@ Shows a small map with the feature. Added by default to every popup
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+shop-type.0 | Only show shops selling {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+shop-name.0 | Only show shops with name {search} |  | search (string)
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_organic.0 | Has organic options | organic=yes\|organic=only
  
 
 This document is autogenerated from [assets/themes/pets/pets.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/pets/pets.json)
\ No newline at end of file
diff --git a/Docs/Layers/drinking_water.md b/Docs/Layers/drinking_water.md
index edb475c4fd..041d080b1c 100644
--- a/Docs/Layers/drinking_water.md
+++ b/Docs/Layers/drinking_water.md
@@ -130,6 +130,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_closest_other_drinking_water_id~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `_closest_other_drinking_water_id~.+` 
 
 This document is autogenerated from [assets/layers/drinking_water/drinking_water.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/drinking_water/drinking_water.json)
\ No newline at end of file
diff --git a/Docs/Layers/dumpstations.md b/Docs/Layers/dumpstations.md
index 5ce14853c0..e1c895575c 100644
--- a/Docs/Layers/dumpstations.md
+++ b/Docs/Layers/dumpstations.md
@@ -113,7 +113,7 @@ This is rendered with  This place charges {charge}
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
diff --git a/Docs/Layers/education_institutions_without_etymology.md b/Docs/Layers/education_institutions_without_etymology.md
index 9b913cdf68..1c816fed38 100644
--- a/Docs/Layers/education_institutions_without_etymology.md
+++ b/Docs/Layers/education_institutions_without_etymology.md
@@ -98,6 +98,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -167,6 +169,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/etymology.md b/Docs/Layers/etymology.md
index b0f7a31e81..e64a3a892e 100644
--- a/Docs/Layers/etymology.md
+++ b/Docs/Layers/etymology.md
@@ -98,6 +98,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -167,6 +169,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/layers/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/fietsstraat.md b/Docs/Layers/fietsstraat.md
index 9a9cf7decd..8581c9cfd2 100644
--- a/Docs/Layers/fietsstraat.md
+++ b/Docs/Layers/fietsstraat.md
@@ -116,7 +116,7 @@ The question is  What sign does this bicycle road have?
   - There are no supplementary signs at this bicycle road.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DDE:244.1' target='_blank'>DE:244.1</a>`
 
 
-Only visible if  `bicycle_road=yes&_country=de`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `bicycle_road=yes&_country=de`
 
 
 
@@ -132,7 +132,7 @@ This is rendered with  This street will become a cyclestreet at {cyclestreet:sta
 
 
 
-Only visible if  `proposed:cyclestreet=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `proposed:cyclestreet=yes`
 
 
 
diff --git a/Docs/Layers/filters.md b/Docs/Layers/filters.md
index 146984c8a4..f5c13c7d8c 100644
--- a/Docs/Layers/filters.md
+++ b/Docs/Layers/filters.md
@@ -41,6 +41,66 @@ Elements must have the all of following tags to be shown on this layer:
  Supported attributes 
 ----------------------
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_image.0 | With and without images (default) | 
+has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.2 | Probably does not have an image | 
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+tactile_paving.0 | With tactile paving | tactile_paving=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+tactile_paving_advanced.0 | With or without tactile paving (default) | 
+tactile_paving_advanced.1 | With tactile paving | tactile_paving=yes
+tactile_paving_advanced.2 | Without tactile paving | tactile_paving=no
+tactile_paving_advanced.3 | No information about tactile paving | 
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_organic.0 | Has organic options | organic=yes\|organic=only
  
 
 This document is autogenerated from [assets/layers/filters/filters.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/filters/filters.json)
\ No newline at end of file
diff --git a/Docs/Layers/fitness_centre.md b/Docs/Layers/fitness_centre.md
index 8917d4f40b..9fea443e88 100644
--- a/Docs/Layers/fitness_centre.md
+++ b/Docs/Layers/fitness_centre.md
@@ -227,6 +227,19 @@ Shows the reviews module (including the possibility to leave a review)
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/fitness_centre/fitness_centre.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/fitness_centre/fitness_centre.json)
\ No newline at end of file
diff --git a/Docs/Layers/fitness_station.md b/Docs/Layers/fitness_station.md
index 8ced21969a..dfcfc134e4 100644
--- a/Docs/Layers/fitness_station.md
+++ b/Docs/Layers/fitness_station.md
@@ -150,6 +150,19 @@ This rendering asks information about the property  [opening_hours](https://wiki
 
 This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)}
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/fitness_station/fitness_station.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/fitness_station/fitness_station.json)
\ No newline at end of file
diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md
index 72adb45c26..6b0a7af1f7 100644
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@@ -77,8 +77,10 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:halal#values) [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/friture:oil#values) [friture:oil](https://wiki.openstreetmap.org/wiki/Key:friture:oil) | Multiple choice | [vegetable](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Dvegetable) [animal](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/reusable_packaging:accept#values) [reusable_packaging:accept](https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno)
@@ -387,6 +389,23 @@ The question is  Does this restaurant offer a halal menu?
 
 
 
+### organic (no friture) 
+
+
+
+The question is  Does this restaurant offer organic food?
+
+
+
+
+
+  - There are no organic options available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - There is an organic menu  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - Only organic options are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+
+
 ### friture-vegetarian 
 
 
@@ -402,7 +421,7 @@ The question is  Does this fries shop have vegetarian snacks?
   - No vegetarian snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -421,7 +440,26 @@ The question is  Does this fries shop have vegan snacks?
   - No vegan snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
+
+
+
+### friture-organic 
+
+
+
+The question is  Does this fries shop offer organic snacks?
+
+
+
+
+
+  - Organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - No organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - Only organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -439,7 +477,7 @@ The question is  Does this fries shop use vegetable or animal oil for cooking?
   - The frying is done with animal oil  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:friture:oil' target='_blank'>friture:oil</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal' target='_blank'>animal</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -458,7 +496,7 @@ The question is  If you bring your own container (such as a cooking pot and smal
   - You <b>must</b> bring your own container to order here.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept' target='_blank'>reusable_packaging:accept</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly' target='_blank'>only</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -533,7 +571,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -554,7 +592,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
@@ -566,6 +604,61 @@ Shows the reviews module (including the possibility to leave a review)
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+vegetarian.0 | Has a vegetarian menu | diet:vegetarian=yes\|diet:vegetarian=only|diet:vegan=yes|diet:vegan=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+vegan.0 | Has a vegan menu | diet:vegan=yes\|diet:vegan=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+halal.0 | Has a halal menu | diet:halal=yes\|diet:halal=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_organic.0 | Has organic options | organic=yes\|organic=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
  
 
 This document is autogenerated from [assets/layers/food/food.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/food/food.json)
\ No newline at end of file
diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md
index a09baf9b00..dd9bb5df64 100644
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@@ -74,8 +74,10 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:halal#values) [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegetarian#values) [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/diet:vegan#values) [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/friture:oil#values) [friture:oil](https://wiki.openstreetmap.org/wiki/Key:friture:oil) | Multiple choice | [vegetable](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Dvegetable) [animal](https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/reusable_packaging:accept#values) [reusable_packaging:accept](https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno)
@@ -384,6 +386,23 @@ The question is  Does this restaurant offer a halal menu?
 
 
 
+### organic (no friture) 
+
+
+
+The question is  Does this restaurant offer organic food?
+
+
+
+
+
+  - There are no organic options available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - There is an organic menu  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - Only organic options are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+
+
 ### friture-vegetarian 
 
 
@@ -399,7 +418,7 @@ The question is  Does this fries shop have vegetarian snacks?
   - No vegetarian snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -418,7 +437,26 @@ The question is  Does this fries shop have vegan snacks?
   - No vegan snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
+
+
+
+### friture-organic 
+
+
+
+The question is  Does this fries shop offer organic snacks?
+
+
+
+
+
+  - Organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - No organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+  - Only organic snacks are available  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -436,7 +474,7 @@ The question is  Does this fries shop use vegetable or animal oil for cooking?
   - The frying is done with animal oil  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:friture:oil' target='_blank'>friture:oil</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:friture:oil%3Danimal' target='_blank'>animal</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -455,7 +493,7 @@ The question is  If you bring your own container (such as a cooking pot and smal
   - You <b>must</b> bring your own container to order here.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:reusable_packaging:accept' target='_blank'>reusable_packaging:accept</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:reusable_packaging:accept%3Donly' target='_blank'>only</a>`
 
 
-Only visible if  `cuisine=friture`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `cuisine=friture`
 
 
 
@@ -530,7 +568,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -551,7 +589,7 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
 
 
 
@@ -587,6 +625,61 @@ Shows a small map with the feature. Added by default to every popup
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+vegetarian.0 | Has a vegetarian menu | diet:vegetarian=yes\|diet:vegetarian=only|diet:vegan=yes|diet:vegan=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+vegan.0 | Has a vegan menu | diet:vegan=yes\|diet:vegan=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+halal.0 | Has a halal menu | diet:halal=yes\|diet:halal=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_organic.0 | Has organic options | organic=yes\|organic=only
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
  
 
 This document is autogenerated from [assets/themes/fritures/fritures.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/fritures/fritures.json)
\ No newline at end of file
diff --git a/Docs/Layers/health_and_social_places_without_etymology.md b/Docs/Layers/health_and_social_places_without_etymology.md
index f149137008..a2181d013d 100644
--- a/Docs/Layers/health_and_social_places_without_etymology.md
+++ b/Docs/Layers/health_and_social_places_without_etymology.md
@@ -98,6 +98,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -167,6 +169,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/hotel.md b/Docs/Layers/hotel.md
index 760651bb2b..fb79b4cfae 100644
--- a/Docs/Layers/hotel.md
+++ b/Docs/Layers/hotel.md
@@ -224,7 +224,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -245,6 +245,6 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan` 
 
 This document is autogenerated from [assets/layers/hotel/hotel.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/hotel/hotel.json)
\ No newline at end of file
diff --git a/Docs/Layers/indoors.md b/Docs/Layers/indoors.md
index a94e31700c..e581844ffd 100644
--- a/Docs/Layers/indoors.md
+++ b/Docs/Layers/indoors.md
@@ -92,7 +92,7 @@ This is rendered with  This room has the reference number {ref}
 
 
 
-Only visible if  `indoor=room|indoor=area|indoor=corridor`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=room|indoor=area|indoor=corridor`
 
 
 
@@ -108,6 +108,6 @@ This is rendered with  This room is named {name}
 
 
 
-Only visible if  `indoor=room|indoor=area|indoor=corridor`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `indoor=room|indoor=area|indoor=corridor` 
 
 This document is autogenerated from [assets/layers/indoors/indoors.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/indoors/indoors.json)
\ No newline at end of file
diff --git a/Docs/Layers/kerbs.md b/Docs/Layers/kerbs.md
index 17fa1cb95a..111311fd88 100644
--- a/Docs/Layers/kerbs.md
+++ b/Docs/Layers/kerbs.md
@@ -103,7 +103,7 @@ The question is  What is the height of this kerb?
   - This option cannot be chosen as answer
 
 
-Only visible if  `_geometry:type=Point`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_geometry:type=Point`
 
 
 
@@ -123,7 +123,7 @@ The question is  Is there tactile paving at this kerb?
   - This option cannot be chosen as answer
 
 
-Only visible if  `_geometry:type=Point`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_geometry:type=Point`
 
 
 
@@ -142,6 +142,34 @@ This is rendered with  Kerb height: {kerb:height}
 
 
   - This kerb is flush and is lower than 1cm.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:kerb:height' target='_blank'>kerb:height</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:kerb:height%3D0' target='_blank'>0</a>`
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+kerb-type.0 | All types of kerbs (default) | 
+kerb-type.1 | Raised kerb (>3 cm) | kerb=raised
+kerb-type.2 | Lowered kerb (~3 cm) | kerb=lowered
+kerb-type.3 | Flush kerb (~0cm) | kerb=flush
+kerb-type.4 | No kerb | kerb=no
+kerb-type.5 | Kerb with unknown height | 
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+tactile_paving_advanced.0 | With or without tactile paving (default) | 
+tactile_paving_advanced.1 | With tactile paving | tactile_paving=yes
+tactile_paving_advanced.2 | Without tactile paving | tactile_paving=no
+tactile_paving_advanced.3 | No information about tactile paving | 
  
 
 This document is autogenerated from [assets/layers/kerbs/kerbs.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/kerbs/kerbs.json)
\ No newline at end of file
diff --git a/Docs/Layers/kindergarten_childcare.md b/Docs/Layers/kindergarten_childcare.md
index d924159cf1..3a234719cc 100644
--- a/Docs/Layers/kindergarten_childcare.md
+++ b/Docs/Layers/kindergarten_childcare.md
@@ -173,7 +173,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `amenity=childcare`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=childcare`
 
 
 
diff --git a/Docs/Layers/map.md b/Docs/Layers/map.md
index d8ee5906f8..79a9327777 100644
--- a/Docs/Layers/map.md
+++ b/Docs/Layers/map.md
@@ -116,6 +116,6 @@ The question is  Is the OpenStreetMap-attribution given?
   - This option cannot be chosen as answer
 
 
-Only visible if  `map_source~^((O|)pen(S|s)treet(M|m)ap)$|map_source=osm|map_source=OSM`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `map_source~^((O|)pen(S|s)treet(M|m)ap)$|map_source=osm|map_source=OSM` 
 
 This document is autogenerated from [assets/layers/map/map.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/map/map.json)
\ No newline at end of file
diff --git a/Docs/Layers/maproulette.md b/Docs/Layers/maproulette.md
index 028e4fb225..1e7beee6f8 100644
--- a/Docs/Layers/maproulette.md
+++ b/Docs/Layers/maproulette.md
@@ -84,6 +84,41 @@ 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~.+`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+status.0 | Show tasks with all statuses (default) | 
+status.1 | Show tasks that are created | status=0
+status.2 | Show tasks that are fixed | status=1
+status.3 | Show tasks that are false positives | status=2
+status.4 | Show tasks that are skipped | status=3
+status.5 | Show tasks that are deleted | status=4
+status.6 | Show tasks that are already fixed | status=5
+status.7 | Show tasks that are marked as too hard | status=6
+status.8 | Show tasks that are disabled | status=9
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+parent-name.0 | Challenge name contains {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+parent-id.0 | Challenge ID matches {search} |  | search (string)
+ 
 
 This document is autogenerated from [assets/layers/maproulette/maproulette.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/maproulette/maproulette.json)
\ No newline at end of file
diff --git a/Docs/Layers/maproulette_challenge.md b/Docs/Layers/maproulette_challenge.md
index 2d0f413efa..b36a752036 100644
--- a/Docs/Layers/maproulette_challenge.md
+++ b/Docs/Layers/maproulette_challenge.md
@@ -107,6 +107,27 @@ 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~.+`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+status.0 | Show tasks with all statuses (default) | 
+status.1 | Show tasks that are created | mr_taskStatus=Created
+status.2 | Show tasks that are fixed | mr_taskStatus=Fixed
+status.3 | Show tasks that are false positives | mr_taskStatus=False positive
+status.4 | Show tasks that are skipped | mr_taskStatus=Skipped
+status.5 | Show tasks that are deleted | mr_taskStatus=Deleted
+status.6 | Show tasks that are already fixed | mr_taskStatus=Already fixed
+status.7 | Show tasks that are marked as too hard | mr_taskStatus=Too hard
+status.8 | Show tasks that are disabled | mr_taskStatus=Disabled
+ 
 
 This document is autogenerated from [assets/layers/maproulette_challenge/maproulette_challenge.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/maproulette_challenge/maproulette_challenge.json)
\ No newline at end of file
diff --git a/Docs/Layers/nature_reserve.md b/Docs/Layers/nature_reserve.md
index 69dd7615f5..39386b18a1 100644
--- a/Docs/Layers/nature_reserve.md
+++ b/Docs/Layers/nature_reserve.md
@@ -167,7 +167,7 @@ The question is  Are dogs allowed in this nature reserve?
   - Dogs are allowed to roam freely  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:dog' target='_blank'>dog</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `access=yes|access=permissive|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=permissive|access=guided`
 
 
 
@@ -291,6 +291,28 @@ This is rendered with  {wikipedia():max-height:25rem}
   - This option cannot be chosen as answer
   - No Wikipedia page has been linked yet  corresponds with  ``
   - This option cannot be chosen as answer
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+access.0 | Freely accesible | access=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+dogs.0 | All nature reserves (default) | 
+dogs.1 | Dogs are allowed to roam freely | dog=yes
+dogs.2 | Dogs are allowed if they are leashed | dog=yes\|dog=leashed
  
 
 This document is autogenerated from [assets/layers/nature_reserve/nature_reserve.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/nature_reserve/nature_reserve.json)
\ No newline at end of file
diff --git a/Docs/Layers/observation_tower.md b/Docs/Layers/observation_tower.md
index e4f3b2ba8b..59cfcd6799 100644
--- a/Docs/Layers/observation_tower.md
+++ b/Docs/Layers/observation_tower.md
@@ -152,7 +152,7 @@ This is rendered with  Visiting this tower costs <b>{charge}</b>
   - Free to visit  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=guided`
 
 
 
@@ -172,7 +172,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes|charge~.+`
 
 
 
@@ -208,7 +208,7 @@ This is rendered with  This tower has {step_count} steps to reach the top
 
 
 
-Only visible if  `access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=guided`
 
 
 
@@ -226,7 +226,7 @@ The question is  Does this tower have an elevator?
   - This tower does not have an elevator  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:elevator' target='_blank'>elevator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:elevator%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access=yes|access=guided`
 
 
 
@@ -260,7 +260,7 @@ The question is  Is this place accessible with a wheelchair?
   - This place is not reachable with a wheelchair  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:wheelchair' target='_blank'>wheelchair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `elevator=yes&access=yes|access=guided`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `elevator=yes&access=yes|access=guided`
 
 
 
diff --git a/Docs/Layers/osm_community_index.md b/Docs/Layers/osm_community_index.md
index ad0e59ac8f..3ddef1e98f 100644
--- a/Docs/Layers/osm_community_index.md
+++ b/Docs/Layers/osm_community_index.md
@@ -65,7 +65,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `level=country`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `level=country`
 
 
 
@@ -79,6 +79,61 @@ 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~.+`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+country.0 | Country | level=country
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+sub_country.0 | Sub Country Group | level=subcountryGroup
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+region.0 | Region | level=region
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+intermediate_region.0 | Intermediate Region | level=intermediateRegion
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+territory.0 | Territory | level=territory
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+world.0 | World | level=world
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+other.0 | Other Communities | 
+ 
 
 This document is autogenerated from [assets/layers/osm_community_index/osm_community_index.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/osm_community_index/osm_community_index.json)
\ No newline at end of file
diff --git a/Docs/Layers/parcel_lockers.md b/Docs/Layers/parcel_lockers.md
index 2aeda32ae3..63273660dc 100644
--- a/Docs/Layers/parcel_lockers.md
+++ b/Docs/Layers/parcel_lockers.md
@@ -165,7 +165,7 @@ The question is  Can you send packages from this parcel locker?
   - You <b>can't</b> send packages from this parcel locker  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:parcel_mail_in' target='_blank'>parcel_mail_in</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:parcel_mail_in%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `amenity=parcel_locker`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=parcel_locker`
 
 
 
@@ -183,6 +183,19 @@ 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`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+ 
 
 This document is autogenerated from [assets/layers/parcel_lockers/parcel_lockers.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/parcel_lockers/parcel_lockers.json)
\ No newline at end of file
diff --git a/Docs/Layers/parks_and_forests_without_etymology.md b/Docs/Layers/parks_and_forests_without_etymology.md
index ddb930fd05..7514cc74da 100644
--- a/Docs/Layers/parks_and_forests_without_etymology.md
+++ b/Docs/Layers/parks_and_forests_without_etymology.md
@@ -98,6 +98,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -167,6 +169,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md
index daa371acfb..4118c9c173 100644
--- a/Docs/Layers/pharmacy.md
+++ b/Docs/Layers/pharmacy.md
@@ -185,6 +185,33 @@ The question is  Is this pharmacy easy to access on a wheelchair?
   - This pharmacy is easy to access on 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%3Dyes' target='_blank'>yes</a>`
   - This pharmacy is hard to access on 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>`
   - This pharmacy has limited access for wheelchair users  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:wheelchair' target='_blank'>wheelchair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited' target='_blank'>limited</a>`
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+drive-through.0 | Has drive through | drive_through=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+dispensing.0 | Pharmacy able to provide prescription drugs | dispensing=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/pharmacy/pharmacy.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/pharmacy/pharmacy.json)
\ No newline at end of file
diff --git a/Docs/Layers/physiotherapist.md b/Docs/Layers/physiotherapist.md
new file mode 100644
index 0000000000..759f7eca27
--- /dev/null
+++ b/Docs/Layers/physiotherapist.md
@@ -0,0 +1,190 @@
+
+
+ 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
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+ 
+
+This document is autogenerated from [assets/layers/physiotherapist/physiotherapist.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/physiotherapist/physiotherapist.json)
\ No newline at end of file
diff --git a/Docs/Layers/postoffices.md b/Docs/Layers/postoffices.md
index 60451863a2..44b27a1d62 100644
--- a/Docs/Layers/postoffices.md
+++ b/Docs/Layers/postoffices.md
@@ -122,7 +122,7 @@ The question is  Is this a post partner?
   - This shop is not a post partner  corresponds with  ``
 
 
-Only visible if  `post_office=post_partner`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `post_office=post_partner`
 
 
 
@@ -150,7 +150,7 @@ This is rendered with  This location offers services for {post_office:brand}
   - This location offers services for bpost  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:post_office:brand' target='_blank'>post_office:brand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:post_office:brand%3Dbpost' target='_blank'>bpost</a>`
 
 
-Only visible if  `post_office=post_partner`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `post_office=post_partner`
 
 
 
@@ -250,6 +250,19 @@ This is rendered with  You can buy stamps from companies: {post_office:stamps}
 
   - You can buy stamps here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:post_office:stamps' target='_blank'>post_office:stamps</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:post_office:stamps%3Dyes' target='_blank'>yes</a>`
   - You can't buy stamps here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:post_office:stamps' target='_blank'>post_office:stamps</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:post_office:stamps%3Dno' target='_blank'>no</a>`
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/postoffices/postoffices.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/postoffices/postoffices.json)
\ No newline at end of file
diff --git a/Docs/Layers/public_bookcase.md b/Docs/Layers/public_bookcase.md
index 3abff0fe68..e0af38b1bb 100644
--- a/Docs/Layers/public_bookcase.md
+++ b/Docs/Layers/public_bookcase.md
@@ -171,7 +171,7 @@ The question is  Is this public bookcase freely accessible?
   - Only accessible to customers  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `indoor=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=yes`
 
 
 
@@ -226,7 +226,7 @@ This is rendered with  The reference number of this public bookcase within {bran
   - This bookcase is not part of a bigger network  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:nobrand' target='_blank'>nobrand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:nobrand%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `brand~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `brand~.+`
 
 
 
@@ -254,6 +254,35 @@ This rendering asks information about the property  [website](https://wiki.opens
 
 This is rendered with  More info on <a href='{website}' target='_blank'>the website</a>
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+kid-books.0 | Kinderboeken aanwezig? | books~^(.*children.*)$
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+adult-books.0 | Boeken voor volwassenen aanwezig? | books~^(.*adults.*)$
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+inside.0 | Indoor or outdoor (default) | 
+inside.1 | Binnen? | indoor=yes
+inside.2 | Buiten? | indoor=no\|
  
 
 This document is autogenerated from [assets/layers/public_bookcase/public_bookcase.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/public_bookcase/public_bookcase.json)
\ No newline at end of file
diff --git a/Docs/Layers/rainbow_crossing_high_zoom.md b/Docs/Layers/rainbow_crossing_high_zoom.md
index 8de253429e..d1e9b86b0f 100644
--- a/Docs/Layers/rainbow_crossing_high_zoom.md
+++ b/Docs/Layers/rainbow_crossing_high_zoom.md
@@ -83,7 +83,7 @@ The question is  Does this crossing has rainbow paintings?
   - This option cannot be chosen as answer
 
 
-Only visible if  `highway=crossing`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing`
 
 
 
diff --git a/Docs/Layers/rainbow_crossings.md b/Docs/Layers/rainbow_crossings.md
index ee309ee94e..a18c9429ba 100644
--- a/Docs/Layers/rainbow_crossings.md
+++ b/Docs/Layers/rainbow_crossings.md
@@ -83,6 +83,6 @@ The question is  Does this crossing has rainbow paintings?
   - This option cannot be chosen as answer
 
 
-Only visible if  `highway=crossing`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `highway=crossing` 
 
 This document is autogenerated from [assets/layers/rainbow_crossings/rainbow_crossings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/rainbow_crossings/rainbow_crossings.json)
\ No newline at end of file
diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md
index 6722a51c38..9a8c158a5b 100644
--- a/Docs/Layers/recycling.md
+++ b/Docs/Layers/recycling.md
@@ -117,7 +117,7 @@ This is rendered with  This recycling centre is named <b>{name}</b>
   - This recycling centre doesn't have a specific name  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:noname' target='_blank'>noname</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:noname%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
@@ -136,7 +136,7 @@ The question is  Where is this container located?
   - This container is located outdoors  corresponds with  ``
 
 
-Only visible if  `recycling_type=container`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=container`
 
 
 
@@ -230,7 +230,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
   - This option cannot be chosen as answer
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
@@ -252,7 +252,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
   - This option cannot be chosen as answer
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
@@ -274,7 +274,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
   - This option cannot be chosen as answer
 
 
-Only visible if  `recycling_type=centre`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `recycling_type=centre`
 
 
 
@@ -293,6 +293,43 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
   - 24/7 opened (including holidays)  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>`
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+recyclingType.0 | All recycling types (default) | 
+recyclingType.1 | Recycling of batteries | recycling:batteries=yes
+recyclingType.2 | Recycling of beverage cartons | recycling:beverage_cartons=yes
+recyclingType.3 | Recycling of cans | recycling:cans=yes
+recyclingType.4 | Recycling of clothes | recycling:clothes=yes
+recyclingType.5 | Recycling of cooking oil | recycling:cooking_oil=yes
+recyclingType.6 | Recycling of engine oil | recycling:engine_oil=yes
+recyclingType.7 | Recycling of green waste | recycling:green_waste=yes\|recycling:organic=yes
+recyclingType.8 | Recycling of glass bottles | recycling:glass_bottles=yes
+recyclingType.9 | Recycling of glass | recycling:glass=yes
+recyclingType.10 | Recycling of newspapers | recycling:newspaper=yes
+recyclingType.11 | Recycling of paper | recycling:paper=yes
+recyclingType.12 | Recycling of plastic bottles | recycling:plastic_bottles=yes
+recyclingType.13 | Recycling of plastic packaging | recycling:plastic_packaging=yes
+recyclingType.14 | Recycling of plastic | recycling:plastic=yes
+recyclingType.15 | Recycling of scrap metal | recycling:scrap_metal=yes
+recyclingType.16 | Recycling of small electrical appliances | recycling:small_appliances=yes\|recycling:small_electrical_appliances=yes
+recyclingType.17 | Recycling of residual waste | recycling:waste=yes
  
 
 This document is autogenerated from [assets/layers/recycling/recycling.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/recycling/recycling.json)
\ No newline at end of file
diff --git a/Docs/Layers/school.md b/Docs/Layers/school.md
index 9e6ce24860..1f40bd5a27 100644
--- a/Docs/Layers/school.md
+++ b/Docs/Layers/school.md
@@ -121,7 +121,7 @@ The question is  What level of education is given on this school?
   - This school offers post-secondary education (e.g. a seventh or eight specialisation year)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:school' target='_blank'>school</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school%3Dpost_secondary' target='_blank'>post_secondary</a>`
 
 
-Only visible if  `_country=be`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
 
 
 
@@ -169,7 +169,7 @@ This is rendered with  This school has facilities for students with {school:for}
   - This is a school for students with special needs  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:school:for' target='_blank'>school:for</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dspecial_needs' target='_blank'>special_needs</a>`
 
 
-Only visible if  `school:for~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `school:for~.+`
 
 
 
diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md
index c7b4162bfc..8e3966ebb5 100644
--- a/Docs/Layers/shops.md
+++ b/Docs/Layers/shops.md
@@ -29,7 +29,6 @@ A shop
   - [personal](https://mapcomplete.osm.be/personal)
   - [pets](https://mapcomplete.osm.be/pets)
   - [shops](https://mapcomplete.osm.be/shops)
-  - [sports](https://mapcomplete.osm.be/sports)
 
 
 
@@ -73,6 +72,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno)
 
 
 
@@ -420,7 +420,7 @@ The question is  What paper formats does this shop offer?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`
 
 
 
@@ -459,7 +459,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
 
 
 
@@ -480,7 +480,26 @@ This is rendered with  The network name is <b>{internet_access:ssid}</b>
   - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
 
 
-Only visible if  `internet_access=wlan`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
+
+
+
+### organic 
+
+
+
+The question is  Does this shop offer organic products?
+
+
+
+
+
+  - This shop offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - This shop only offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+  - This shop does not offer organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist`
 
 
 
@@ -502,6 +521,54 @@ Shows the reviews module (including the possibility to leave a review)
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+shop-type.0 | Only show shops selling {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+shop-name.0 | Only show shops with name {search} |  | search (string)
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_organic.0 | Has organic options | organic=yes\|organic=only
  
 
 This document is autogenerated from [assets/layers/shops/shops.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/shops/shops.json)
\ No newline at end of file
diff --git a/Docs/Layers/speed_camera.md b/Docs/Layers/speed_camera.md
index f9d40f5066..adefafdcb2 100644
--- a/Docs/Layers/speed_camera.md
+++ b/Docs/Layers/speed_camera.md
@@ -88,6 +88,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `ref~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `ref~.+` 
 
 This document is autogenerated from [assets/layers/speed_camera/speed_camera.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/speed_camera/speed_camera.json)
\ No newline at end of file
diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md
index cb4ff866ca..91abcf08b0 100644
--- a/Docs/Layers/sport_pitch.md
+++ b/Docs/Layers/sport_pitch.md
@@ -217,7 +217,7 @@ This is rendered with  Openingsuren: {opening_hours_table()}
   - Always accessible  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:opening_hours' target='_blank'>opening_hours</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7' target='_blank'>24/7</a>`
 
 
-Only visible if  `access~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `access~.+`
 
 
 
@@ -237,6 +237,19 @@ This tagrendering has no question and is thus read-only
 
 This tagrendering has no question and is thus read-only
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/sport_pitch/sport_pitch.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/sport_pitch/sport_pitch.json)
\ No newline at end of file
diff --git a/Docs/Layers/sport_places_without_etymology.md b/Docs/Layers/sport_places_without_etymology.md
index 8aee3170ce..1a3ca7ac91 100644
--- a/Docs/Layers/sport_places_without_etymology.md
+++ b/Docs/Layers/sport_places_without_etymology.md
@@ -98,6 +98,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -167,6 +169,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md
new file mode 100644
index 0000000000..5cb416d2b4
--- /dev/null
+++ b/Docs/Layers/sport_shops.md
@@ -0,0 +1,595 @@
+
+
+ sport_shops 
+=============
+
+
+
+<img src='https://mapcomplete.osm.be/./assets/layers/id_presets/maki-shop.svg' height="100px"> 
+
+A shop
+
+
+
+
+
+
+  - This layer is shown at zoomlevel **12** and higher
+
+
+
+
+#### Themes using this layer 
+
+
+
+
+
+  - [sports](https://mapcomplete.osm.be/sports)
+
+
+
+
+ Basic tags for this layer 
+---------------------------
+
+
+
+Elements must have the all of following tags to be shown on this layer:
+
+
+
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports' target='_blank'>sports</a>
+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+
+
+ Supported attributes 
+----------------------
+
+
+
+Warning: 
+
+this quick overview is incomplete
+
+
+
+attribute | type | values which are supported by this layer
+----------- | ------ | ------------------------------------------
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [hobby](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:ssid#values) [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/organic#values) [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno)
+
+
+
+
+### images 
+
+
+
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata`
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### shops-name 
+
+
+
+The question is  What is the name of this shop?
+
+This rendering asks information about the property  [name](https://wiki.openstreetmap.org/wiki/Key:name) 
+
+This is rendered with  This shop is called <i>{name}</i>
+
+
+
+
+
+### shop_types 
+
+
+
+The question is  What kind of shop is this?
+
+This rendering asks information about the property  [shop](https://wiki.openstreetmap.org/wiki/Key:shop) 
+
+This is rendered with  This is a {shop}
+
+
+
+
+
+  - Farm Supply Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian' target='_blank'>agrarian</a>`
+  - Liquor Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol' target='_blank'>alcohol</a>`
+  - Anime / Manga Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime' target='_blank'>anime</a>`
+  - Antiques Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques' target='_blank'>antiques</a>`
+  - Appliance Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance' target='_blank'>appliance</a>`
+  - Art Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart' target='_blank'>art</a>`
+  - Baby Goods Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods' target='_blank'>baby_goods</a>`
+  - Bag/Luggage Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag' target='_blank'>bag</a>`
+  - Bakery  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery' target='_blank'>bakery</a>`
+  - Bathroom Furnishing Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing' target='_blank'>bathroom_furnishing</a>`
+  - Beauty Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty' target='_blank'>beauty</a>`
+  - Bedding/Mattress Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed' target='_blank'>bed</a>`
+  - Beverage Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages' target='_blank'>beverages</a>`
+  - Bicycle Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle' target='_blank'>bicycle</a>`
+  - Boat Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat' target='_blank'>boat</a>`
+  - Bookmaker  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker' target='_blank'>bookmaker</a>`
+  - Book Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks' target='_blank'>books</a>`
+  - Brewing Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies' target='_blank'>brewing_supplies</a>`
+  - Butcher  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher' target='_blank'>butcher</a>`
+  - Camera Equipment Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera' target='_blank'>camera</a>`
+  - Candle Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles' target='_blank'>candles</a>`
+  - Cannabis Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis' target='_blank'>cannabis</a>`
+  - Car Dealership  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar' target='_blank'>car</a>`
+  - Car Parts Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts' target='_blank'>car_parts</a>`
+  - Car Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair' target='_blank'>car_repair</a>`
+  - RV Dealership  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan' target='_blank'>caravan</a>`
+  - Carpet Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet' target='_blank'>carpet</a>`
+  - Catalog Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue' target='_blank'>catalogue</a>`
+  - Charity Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity' target='_blank'>charity</a>`
+  - Cheese Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese' target='_blank'>cheese</a>`
+  - Drugstore  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist' target='_blank'>chemist</a>`
+  - Chocolate Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate' target='_blank'>chocolate</a>`
+  - Clothing Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes' target='_blank'>clothes</a>`
+  - Coffee Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee' target='_blank'>coffee</a>`
+  - Collectibles Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector' target='_blank'>collector</a>`
+  - Computer Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer' target='_blank'>computer</a>`
+  - Candy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery' target='_blank'>confectionery</a>`
+  - Convenience Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience' target='_blank'>convenience</a>`
+  - Copy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop' target='_blank'>copyshop</a>`
+  - Cosmetics Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics' target='_blank'>cosmetics</a>`
+  - Country Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store' target='_blank'>country_store</a>`
+  - Arts & Crafts Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft' target='_blank'>craft</a>`
+  - Curtain Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain' target='_blank'>curtain</a>`
+  - Dairy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy' target='_blank'>dairy</a>`
+  - Deli  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli' target='_blank'>deli</a>`
+  - Department Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store' target='_blank'>department_store</a>`
+  - DIY Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself' target='_blank'>doityourself</a>`
+  - Door Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors' target='_blank'>doors</a>`
+  - Dry Cleaner  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning' target='_blank'>dry_cleaning</a>`
+  - E-Cigarette Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette' target='_blank'>e-cigarette</a>`
+  - Electrical Equipment Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical' target='_blank'>electrical</a>`
+  - Electronics Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics' target='_blank'>electronics</a>`
+  - Erotic Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic' target='_blank'>erotic</a>`
+  - Fabric Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric' target='_blank'>fabric</a>`
+  - Produce Stand  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm' target='_blank'>farm</a>`
+  - Fashion Accessories Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories' target='_blank'>fashion_accessories</a>`
+  - Fireplace Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace' target='_blank'>fireplace</a>`
+  - Fishing Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing' target='_blank'>fishing</a>`
+  - Flooring Supply Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring' target='_blank'>flooring</a>`
+  - Florist  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist' target='_blank'>florist</a>`
+  - Framing Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe' target='_blank'>frame</a>`
+  - Frozen Food Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food' target='_blank'>frozen_food</a>`
+  - Fuel Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel' target='_blank'>fuel</a>`
+  - Funeral Home  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors' target='_blank'>funeral_directors</a>`
+  - Furniture Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture' target='_blank'>furniture</a>`
+  - Tabletop Game Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames' target='_blank'>games</a>`
+  - Garden Center  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre' target='_blank'>garden_centre</a>`
+  - Bottled Gas Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas' target='_blank'>gas</a>`
+  - General Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral' target='_blank'>general</a>`
+  - Gift Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift' target='_blank'>gift</a>`
+  - Greengrocer  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer' target='_blank'>greengrocer</a>`
+  - Hairdresser  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser' target='_blank'>hairdresser</a>`
+  - Hairdresser Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply' target='_blank'>hairdresser_supply</a>`
+  - Hardware Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware' target='_blank'>hardware</a>`
+  - Health Food Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food' target='_blank'>health_food</a>`
+  - Hearing Aids Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids' target='_blank'>hearing_aids</a>`
+  - Herbalist  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist' target='_blank'>herbalist</a>`
+  - Hifi Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi' target='_blank'>hifi</a>`
+  - Hobby Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhobby' target='_blank'>hobby</a>`
+  - Household Linen Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen' target='_blank'>household_linen</a>`
+  - Houseware Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware' target='_blank'>houseware</a>`
+  - Hunting Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting' target='_blank'>hunting</a>`
+  - Interior Decoration Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration' target='_blank'>interior_decoration</a>`
+  - Jewelry Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry' target='_blank'>jewelry</a>`
+  - Kiosk  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk' target='_blank'>kiosk</a>`
+  - Kitchen Design Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen' target='_blank'>kitchen</a>`
+  - Laundry  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry' target='_blank'>laundry</a>`
+  - Leather Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather' target='_blank'>leather</a>`
+  - Lighting Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting' target='_blank'>lighting</a>`
+  - Locksmith  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith' target='_blank'>locksmith</a>`
+  - Lottery Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery' target='_blank'>lottery</a>`
+  - Mall  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall' target='_blank'>mall</a>`
+  - Massage Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage' target='_blank'>massage</a>`
+  - Medical Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply' target='_blank'>medical_supply</a>`
+  - Military Surplus Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus' target='_blank'>military_surplus</a>`
+  - Mobile Phone Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone' target='_blank'>mobile_phone</a>`
+  - Model Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel' target='_blank'>model</a>`
+  - Money Lender  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender' target='_blank'>money_lender</a>`
+  - Motorcycle Dealership  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle' target='_blank'>motorcycle</a>`
+  - Motorcycle Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair' target='_blank'>motorcycle_repair</a>`
+  - Music Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic' target='_blank'>music</a>`
+  - Musical Instrument Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument' target='_blank'>musical_instrument</a>`
+  - Newspaper/Magazine Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent' target='_blank'>newsagent</a>`
+  - Nutrition Supplements Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements' target='_blank'>nutrition_supplements</a>`
+  - Optician  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician' target='_blank'>optician</a>`
+  - Outdoors Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor' target='_blank'>outdoor</a>`
+  - Online Retailer Outpost  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost' target='_blank'>outpost</a>`
+  - Paint Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint' target='_blank'>paint</a>`
+  - Party Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty' target='_blank'>party</a>`
+  - Pastry Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry' target='_blank'>pastry</a>`
+  - Pawn Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker' target='_blank'>pawnbroker</a>`
+  - Perfume Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery' target='_blank'>perfumery</a>`
+  - Pet Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet' target='_blank'>pet</a>`
+  - Pet Grooming Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming' target='_blank'>pet_grooming</a>`
+  - Photography Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto' target='_blank'>photo</a>`
+  - Pottery Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery' target='_blank'>pottery</a>`
+  - Printer Ink Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink' target='_blank'>printer_ink</a>`
+  - Psychic  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic' target='_blank'>psychic</a>`
+  - Fireworks Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics' target='_blank'>pyrotechnics</a>`
+  - Radio/Electronic Component Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics' target='_blank'>radiotechnics</a>`
+  - Religious Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion' target='_blank'>religion</a>`
+  - Rental Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental' target='_blank'>rental</a>`
+  - Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair' target='_blank'>repair</a>`
+  - Scuba Diving Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving' target='_blank'>scuba_diving</a>`
+  - Seafood Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood' target='_blank'>seafood</a>`
+  - Consignment/Thrift Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand' target='_blank'>second_hand</a>`
+  - Sewing Supply Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing' target='_blank'>sewing</a>`
+  - Shoe Repair Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair' target='_blank'>shoe_repair</a>`
+  - Shoe Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes' target='_blank'>shoes</a>`
+  - Spice Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices' target='_blank'>spices</a>`
+  - Sporting Goods Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports' target='_blank'>sports</a>`
+  - Stationery Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery' target='_blank'>stationery</a>`
+  - Storage Rental  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental' target='_blank'>storage_rental</a>`
+  - Supermarket  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket' target='_blank'>supermarket</a>`
+  - Pool Supply Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool' target='_blank'>swimming_pool</a>`
+  - Tailor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor' target='_blank'>tailor</a>`
+  - Tattoo Parlor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo' target='_blank'>tattoo</a>`
+  - Tea Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea' target='_blank'>tea</a>`
+  - Telecom Retail Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication' target='_blank'>telecommunication</a>`
+  - Ticket Seller  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket' target='_blank'>ticket</a>`
+  - Tile Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles' target='_blank'>tiles</a>`
+  - Tobacco Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco' target='_blank'>tobacco</a>`
+  - Tool Rental  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire' target='_blank'>tool_hire</a>`
+  - Toy Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys' target='_blank'>toys</a>`
+  - Trade Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade' target='_blank'>trade</a>`
+  - Travel Agency  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency' target='_blank'>travel_agency</a>`
+  - Trophy Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy' target='_blank'>trophy</a>`
+  - Tire Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres' target='_blank'>tyres</a>`
+  - Vacuum Cleaner Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner' target='_blank'>vacuum_cleaner</a>`
+  - Variety Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store' target='_blank'>variety_store</a>`
+  - Video Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo' target='_blank'>video</a>`
+  - Video Game Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games' target='_blank'>video_games</a>`
+  - Watches Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches' target='_blank'>watches</a>`
+  - Drinking Water Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater' target='_blank'>water</a>`
+  - Watersport/Swim Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports' target='_blank'>water_sports</a>`
+  - Weapon Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons' target='_blank'>weapons</a>`
+  - Wholesale Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale' target='_blank'>wholesale</a>`
+  - Wig Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs' target='_blank'>wigs</a>`
+  - Window Blind Store  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>`
+  - Wine Shop  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>`
+
+
+
+
+### opening_hours 
+
+
+
+The question is  What are the opening hours of {title()}?
+
+This rendering asks information about the property  [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) 
+
+This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)}
+
+
+
+
+
+### website 
+
+
+
+The question is  What is the website of {title()}?
+
+This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
+
+This is rendered with  <a href='{website}' target='_blank'>{website}</a>
+
+
+
+
+
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### email 
+
+
+
+The question is  What is the email address of {title()}?
+
+This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
+
+This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
+
+
+
+
+
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### phone 
+
+
+
+The question is  What is the phone number of {title()}?
+
+This rendering asks information about the property  [phone](https://wiki.openstreetmap.org/wiki/Key:phone) 
+
+This is rendered with  <a href='tel:{phone}'>{phone}</a>
+
+
+
+
+
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
+  - This option cannot be chosen as answer
+
+
+
+
+### payment-options 
+
+
+
+The question is  Which methods of payment are accepted here?
+
+
+
+
+
+  - Cash is accepted here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:payment:cash' target='_blank'>payment:cash</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cash%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cash' target='_blank'>payment:cash</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cash%3Dno' target='_blank'>no</a>
+  - Payment cards are accepted here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
+
+
+
+
+### level 
+
+
+
+The question is  On what level is this feature located?
+
+This rendering asks information about the property  [level](https://wiki.openstreetmap.org/wiki/Key:level) 
+
+This is rendered with  Located on the {level}th floor
+
+
+
+
+
+  - Located underground  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:location' target='_blank'>location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:location%3Dunderground' target='_blank'>underground</a>`
+  - This option cannot be chosen as answer
+  - Located on the ground floor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D0' target='_blank'>0</a>`
+  - Located on the ground floor  corresponds with  ``
+  - This option cannot be chosen as answer
+  - Located on the first floor  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D1' target='_blank'>1</a>`
+  - Located on the first basement level  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:level' target='_blank'>level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:level%3D-1' target='_blank'>-1</a>`
+
+
+
+
+### copyshop-print-sizes 
+
+
+
+The question is  What paper formats does this shop offer?
+
+
+
+
+
+  - This shop can print on papers of size A4  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A4' target='_blank'>service:print:A4</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A4%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A4' target='_blank'>service:print:A4</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A4%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A3  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A3' target='_blank'>service:print:A3</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A3%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A3' target='_blank'>service:print:A3</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A3%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A2  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A2' target='_blank'>service:print:A2</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A2%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A2' target='_blank'>service:print:A2</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A2%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A1  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A1' target='_blank'>service:print:A1</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A1%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A1' target='_blank'>service:print:A1</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A1%3Dno' target='_blank'>no</a>
+  - This shop can print on papers of size A0  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dyes' target='_blank'>yes</a>`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`
+
+
+
+### internet 
+
+
+
+The question is  Does this place offer internet access?
+
+
+
+
+
+  - This place offers wireless internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan' target='_blank'>wlan</a>`
+  - This place <b>does not</b> offer internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno' target='_blank'>no</a>`
+  - This place offers internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dyes' target='_blank'>yes</a>`
+  - This option cannot be chosen as answer
+  - This place offers internet access via a terminal or computer  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal' target='_blank'>terminal</a>`
+  - This place offers wired internet access  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired' target='_blank'>wired</a>`
+
+
+
+
+### internet-fee 
+
+
+
+The question is  Is there a fee for internet access?
+
+
+
+
+
+  - There is a fee for the internet access at this place  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes' target='_blank'>yes</a>`
+  - Internet access is free at this place  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno' target='_blank'>no</a>`
+  - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `internet_access!=no&internet_access~.+`
+
+
+
+### internet-ssid 
+
+
+
+The question is  What is the network name for the wireless internet access?
+
+This rendering asks information about the property  [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) 
+
+This is rendered with  The network name is <b>{internet_access:ssid}</b>
+
+
+
+
+
+  - Telekom  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `internet_access=wlan`
+
+
+
+### organic 
+
+
+
+The question is  Does this shop offer organic products?
+
+
+
+
+
+  - This shop offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>`
+  - This shop only offers organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>`
+  - This shop does not offer organic products  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist`
+
+
+
+### questions 
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### reviews 
+
+
+
+Shows the reviews module (including the possibility to leave a review)
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### questions 
+
+
+
+Show the images block at this location
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### minimap 
+
+
+
+Shows a small map with the feature. Added by default to every popup
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+shop-type.0 | Only show shops selling {search} |  | search (string)
+
+
+
+
+id | question | osmTags | fields
+---- | ---------- | --------- | --------
+shop-name.0 | Only show shops with name {search} |  | search (string)
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cash.0 | Accepts cash | payment:cash=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+accepts_cards.0 | Accepts payment cards | payment:cards=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+has_organic.0 | Has organic options | organic=yes\|organic=only
+ 
+
+This document is autogenerated from [assets/themes/sports/sports.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/sports/sports.json)
\ No newline at end of file
diff --git a/Docs/Layers/sports_centre.md b/Docs/Layers/sports_centre.md
index df0a1921fc..ade6ab8868 100644
--- a/Docs/Layers/sports_centre.md
+++ b/Docs/Layers/sports_centre.md
@@ -169,6 +169,19 @@ The question is  Is this place accessible with a wheelchair?
   - This place is easily 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%3Dyes' target='_blank'>yes</a>`
   - It is possible to reach this place in a wheelchair, but it is not easy  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:wheelchair' target='_blank'>wheelchair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited' target='_blank'>limited</a>`
   - 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>`
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/sports_centre/sports_centre.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/sports_centre/sports_centre.json)
\ No newline at end of file
diff --git a/Docs/Layers/stairs.md b/Docs/Layers/stairs.md
index c3fdf4756a..465f164a6f 100644
--- a/Docs/Layers/stairs.md
+++ b/Docs/Layers/stairs.md
@@ -110,7 +110,7 @@ The question is  Do these stairs have tactile writing on the handrail?
   - There is no tactile writing on the handrail  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:tactile_writing' target='_blank'>tactile_writing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tactile_writing%3Dno' target='_blank'>no</a>`
 
 
-Only visible if  `handrail=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `handrail=yes`
 
 
 
@@ -122,7 +122,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `tactile_writing=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `tactile_writing=yes`
 
 
 
diff --git a/Docs/Layers/street_lamps.md b/Docs/Layers/street_lamps.md
index 5d69cfa9e5..0bbae2f256 100644
--- a/Docs/Layers/street_lamps.md
+++ b/Docs/Layers/street_lamps.md
@@ -133,7 +133,7 @@ The question is  How is this lamp mounted to the pole?
   - This lamp sits at the end of a bent mast  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:lamp_mount' target='_blank'>lamp_mount</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:lamp_mount%3Dbent_mast' target='_blank'>bent_mast</a>`
 
 
-Only visible if  `support=pole`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `support=pole`
 
 
 
@@ -203,7 +203,7 @@ This is rendered with  This lamp has {light:count} fixtures
   - This lamp has 2 fixtures  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:light:count' target='_blank'>light:count</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:light:count%3D2' target='_blank'>2</a>`
 
 
-Only visible if  `support=pole`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `support=pole`
 
 
 
@@ -237,6 +237,6 @@ This is rendered with  This lamp points towards {light:direction}
 
 
 
-Only visible if  `light:count=1`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `light:count=1` 
 
 This document is autogenerated from [assets/layers/street_lamps/street_lamps.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/street_lamps/street_lamps.json)
\ No newline at end of file
diff --git a/Docs/Layers/streets_without_etymology.md b/Docs/Layers/streets_without_etymology.md
index ef70dc49fb..7519a6d4b7 100644
--- a/Docs/Layers/streets_without_etymology.md
+++ b/Docs/Layers/streets_without_etymology.md
@@ -99,6 +99,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -168,6 +170,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/surveillance_camera.md b/Docs/Layers/surveillance_camera.md
index 052f7e6b6e..ab86d6223c 100644
--- a/Docs/Layers/surveillance_camera.md
+++ b/Docs/Layers/surveillance_camera.md
@@ -170,7 +170,7 @@ The question is  Is the public space surveilled by this camera an indoor or outd
   - This option cannot be chosen as answer
 
 
-Only visible if  `surveillance:type=public`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `surveillance:type=public`
 
 
 
@@ -186,7 +186,7 @@ This is rendered with  Located on level {level}
 
 
 
-Only visible if  `indoor=yes|surveillance:type=ye`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `indoor=yes|surveillance:type=ye`
 
 
 
diff --git a/Docs/Layers/tertiary_education.md b/Docs/Layers/tertiary_education.md
index be84ce2e88..510a962547 100644
--- a/Docs/Layers/tertiary_education.md
+++ b/Docs/Layers/tertiary_education.md
@@ -102,7 +102,7 @@ The question is  What level of education is given here?
   - Doctorate degrees are awarded here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:isced:2011:level' target='_blank'>isced:2011:level</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Ddoctorate' target='_blank'>doctorate</a>`
 
 
-Only visible if  `amenity=university`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `amenity=university`
 
 
 
diff --git a/Docs/Layers/toekomstige_fietsstraat.md b/Docs/Layers/toekomstige_fietsstraat.md
index 3bec429985..13fa41a468 100644
--- a/Docs/Layers/toekomstige_fietsstraat.md
+++ b/Docs/Layers/toekomstige_fietsstraat.md
@@ -116,7 +116,7 @@ The question is  What sign does this bicycle road have?
   - There are no supplementary signs at this bicycle road.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DDE:244.1' target='_blank'>DE:244.1</a>`
 
 
-Only visible if  `bicycle_road=yes&_country=de`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `bicycle_road=yes&_country=de`
 
 
 
@@ -132,7 +132,7 @@ This is rendered with  This street will become a cyclestreet at {cyclestreet:sta
 
 
 
-Only visible if  `proposed:cyclestreet=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `proposed:cyclestreet=yes`
 
 
 
diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md
index 31346f129c..08bc373500 100644
--- a/Docs/Layers/toilet.md
+++ b/Docs/Layers/toilet.md
@@ -168,7 +168,7 @@ This is rendered with  The fee is {charge}
 
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -188,7 +188,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `fee=yes`
 
 
 
@@ -240,7 +240,7 @@ This is rendered with  The door to the wheelchair-accessible toilet is {canonica
 
 
 
-Only visible if  `wheelchair=yes|wheelchair=designated`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `wheelchair=yes|wheelchair=designated`
 
 
 
@@ -298,7 +298,7 @@ This is rendered with  The changing table is located at {changing_table:location
   - The changing table is in a dedicated room.   corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:changing_table:location' target='_blank'>changing_table:location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room' target='_blank'>dedicated_room</a>`
 
 
-Only visible if  `changing_table=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `changing_table=yes`
 
 
 
@@ -344,6 +344,40 @@ This rendering asks information about the property  [description](https://wiki.o
 
 This is rendered with  {description}
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+wheelchair.0 | Wheelchair accessible | wheelchair=yes\|wheelchair=designated
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+changing_table.0 | Has a changing table | changing_table=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+free.0 | Free to use | fee=no\|fee=0|charge=0
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/toilet/toilet.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/toilet/toilet.json)
\ No newline at end of file
diff --git a/Docs/Layers/toilet_at_amenity.md b/Docs/Layers/toilet_at_amenity.md
index ccad95c9d7..e2b204cff5 100644
--- a/Docs/Layers/toilet_at_amenity.md
+++ b/Docs/Layers/toilet_at_amenity.md
@@ -166,7 +166,7 @@ This is rendered with  The fee is {toilets:charge}
 
 
 
-Only visible if  `toilets:fee=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `toilets:fee=yes`
 
 
 
@@ -213,7 +213,7 @@ This is rendered with  The door to the wheelchair-accessible toilet is {canonica
 
 
 
-Only visible if  `toilets:wheelchair=yes|toilets:wheelchair=designated`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `toilets:wheelchair=yes|toilets:wheelchair=designated`
 
 
 
@@ -271,7 +271,7 @@ This is rendered with  The changing table is located at {changing_table:location
   - The changing table is in a dedicated room.   corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:changing_table:location' target='_blank'>changing_table:location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room' target='_blank'>dedicated_room</a>`
 
 
-Only visible if  `changing_table=yes`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `changing_table=yes`
 
 
 
@@ -317,6 +317,40 @@ This rendering asks information about the property  [toilets:description](https:
 
 This is rendered with  {toilets:description}
 
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+wheelchair.0 | Wheelchair accessible | toilets:wheelchair=yes\|toilets:wheelchair=designated
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+changing_table.0 | Has a changing table | changing_table=yes
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+free.0 | Free to use | toilets:fee=no\|toilets:fee=0|toilets:charge=0
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+open_now.0 | Opened now | _isOpen=yes
  
 
 This document is autogenerated from [assets/layers/toilet_at_amenity/toilet_at_amenity.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/toilet_at_amenity/toilet_at_amenity.json)
\ No newline at end of file
diff --git a/Docs/Layers/toursistic_places_without_etymology.md b/Docs/Layers/toursistic_places_without_etymology.md
index b7be182710..b6ff6fa863 100644
--- a/Docs/Layers/toursistic_places_without_etymology.md
+++ b/Docs/Layers/toursistic_places_without_etymology.md
@@ -98,6 +98,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_country=be`
+
 
 
 ### simple etymology 
@@ -167,6 +169,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `wikidata~.+` 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/transit_stops.md b/Docs/Layers/transit_stops.md
index 20e1edff16..8bdcb3625f 100644
--- a/Docs/Layers/transit_stops.md
+++ b/Docs/Layers/transit_stops.md
@@ -238,6 +238,40 @@ 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~.+`
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+shelter.0 | With a shelter | shelter=yes\|shelter=separate
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+bench.0 | With a bench | bench=yes\|bench=separate
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+bin.0 | With a bin | bin=yes\|bin=separate
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+tactile_paving.0 | With tactile paving | tactile_paving=yes
+ 
 
 This document is autogenerated from [assets/layers/transit_stops/transit_stops.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/transit_stops/transit_stops.json)
\ No newline at end of file
diff --git a/Docs/Layers/tree_node.md b/Docs/Layers/tree_node.md
index 185f587a1f..1260113e21 100644
--- a/Docs/Layers/tree_node.md
+++ b/Docs/Layers/tree_node.md
@@ -98,7 +98,7 @@ This tagrendering has no question and is thus read-only
   - Height: {height}&nbsp;m  corresponds with  `height~^(^[0-9.]+$)$`
 
 
-Only visible if  `height~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `height~.+`
 
 
 
@@ -134,7 +134,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikipedia~.+|wikidata~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `wikipedia~.+|wikidata~.+`
 
 
 
@@ -211,7 +211,7 @@ This is rendered with  Name: {name}
   - The tree does not have a name.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:noname' target='_blank'>noname</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:noname%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument|name~.+`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `denotation=landmark|denotation=natural_monument|name~.+`
 
 
 
@@ -233,7 +233,7 @@ The question is  Is this tree registered heritage?
   - This option cannot be chosen as answer
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `denotation=landmark|denotation=natural_monument`
 
 
 
@@ -249,7 +249,7 @@ This is rendered with  <img src="./assets/layers/tree_node/Onroerend_Erfgoed_log
 
 
 
-Only visible if  `heritage=4&heritage:operator=OnroerendErfgoed`  is shown
+This tagrendering is only visible in the popup if the following condition is met: `heritage=4&heritage:operator=OnroerendErfgoed`
 
 
 
@@ -265,6 +265,6 @@ This is rendered with  <img src="./assets/svg/wikidata.svg" style="width:1em;hei
 
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument|wikidata~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `denotation=landmark|denotation=natural_monument|wikidata~.+` 
 
 This document is autogenerated from [assets/layers/tree_node/tree_node.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/tree_node/tree_node.json)
\ No newline at end of file
diff --git a/Docs/Layers/walls_and_buildings.md b/Docs/Layers/walls_and_buildings.md
index 6f44f5f080..5cac01f60c 100644
--- a/Docs/Layers/walls_and_buildings.md
+++ b/Docs/Layers/walls_and_buildings.md
@@ -89,6 +89,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_biggest_width_id~.+`  is shown 
+This tagrendering is only visible in the popup if the following condition is met: `_biggest_width_id~.+` 
 
 This document is autogenerated from [assets/layers/walls_and_buildings/walls_and_buildings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/walls_and_buildings/walls_and_buildings.json)
\ No newline at end of file
diff --git a/Docs/Layers/waste_basket.md b/Docs/Layers/waste_basket.md
index 702fa1ac6f..a474dee936 100644
--- a/Docs/Layers/waste_basket.md
+++ b/Docs/Layers/waste_basket.md
@@ -116,6 +116,32 @@ The question is  Does this waste basket have a dispenser for dog excrement bags?
   - This waste basket <b>does not</b> have a dispenser for (dog) excrement bags  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:not:vending' target='_blank'>not:vending</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:not:vending%3Ddog_excrement_bag' target='_blank'>dog_excrement_bag</a>`
   - This waste basket <b>does not</b> have a dispenser for (dog) excrement bags  corresponds with  ``
   - This option cannot be chosen as answer
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+waste-type.0 | All types (default) | 
+waste-type.1 | Waste basket for cigarettes | waste~^(.*cigarettes.*)$
+waste-type.2 | Waste basket for drugs | waste~^(.*drugs.*)$
+waste-type.3 | Waste basket for dog excrement | waste~^(.*dog_excrement.*)$
+waste-type.4 | Waste basket for trash | waste~^(.*trash.*)$
+waste-type.5 | Waste basket for sharps | waste~^(.*sharps.*)$
+waste-type.6 | Waste basket for plastic | waste~^(.*plastic.*)$
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+waste-vending.0 | Waste basket with dispenser for (dog) excrement bags | vending=dog_excrement_bag
  
 
 This document is autogenerated from [assets/layers/waste_basket/waste_basket.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/waste_basket/waste_basket.json)
\ No newline at end of file
diff --git a/Docs/Layers/waste_disposal.md b/Docs/Layers/waste_disposal.md
index fdce75be1d..71086740d3 100644
--- a/Docs/Layers/waste_disposal.md
+++ b/Docs/Layers/waste_disposal.md
@@ -100,6 +100,19 @@ The question is  Where is this container located?
   - This is an underground container  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:location' target='_blank'>location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:location%3Dunderground' target='_blank'>underground</a>`
   - This container is located indoors  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:location' target='_blank'>location</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:location%3Dindoor' target='_blank'>indoor</a>`
   - This container is located outdoors  corresponds with  ``
+
+
+
+
+#### Filters 
+
+
+
+
+
+id | question | osmTags
+---- | ---------- | ---------
+public-access.0 | Only public access | access=yes
  
 
 This document is autogenerated from [assets/layers/waste_disposal/waste_disposal.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/waste_disposal/waste_disposal.json)
\ No newline at end of file
diff --git a/Docs/SpecialInputElements.md b/Docs/SpecialInputElements.md
index 2fe4305b0b..79d4fafe72 100644
--- a/Docs/SpecialInputElements.md
+++ b/Docs/SpecialInputElements.md
@@ -102,7 +102,7 @@ name | doc
 key | the value of this tag will initialize search (default: name)
 options | A JSON-object of type `{ removePrefixes: string[], removePostfixes: string[] }`. 
 
-subarg | doc
+subarg \| doc
 -------- | -----
 removePrefixes | remove these snippets of text from the start of the passed string to search. This is either a list OR a hash of languages to a list
 removePostfixes | remove these snippets of text from the end of the passed string to search. This is either a list OR a hash of languages to a list
@@ -219,7 +219,7 @@ name | doc
 ------ | -----
 options | A JSON-object of type `{ prefix: string, postfix: string }`.  
 
-subarg | doc
+subarg \| doc
 -------- | -----
 prefix | Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse
 postfix | Piece of text that will always be added to the end of the generated opening hours
diff --git a/Docs/TagInfo/mapcomplete_artwork.json b/Docs/TagInfo/mapcomplete_artwork.json
index d61cbd92b7..7df0b10b01 100644
--- a/Docs/TagInfo/mapcomplete_artwork.json
+++ b/Docs/TagInfo/mapcomplete_artwork.json
@@ -128,6 +128,155 @@
     {
       "key": "subject:wikidata",
       "description": "Layer 'Artworks' shows and asks freeform values for key 'subject:wikidata' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "amenity",
+      "description": "Layer 'Artworks' shows amenity=bench with a fixed text, namely 'This artwork also serves as a bench' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "bench"
+    },
+    {
+      "key": "amenity",
+      "description": "Layer 'Artworks' shows  with a fixed text, namely 'This artwork does not serve as a bench' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map') Picking this answer will delete the key amenity.",
+      "value": ""
+    },
+    {
+      "key": "backrest",
+      "description": "Layer 'Artworks' shows backrest=yes with a fixed text, namely 'Does have a backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "yes"
+    },
+    {
+      "key": "backrest",
+      "description": "Layer 'Artworks' shows backrest=no with a fixed text, namely 'Does <b>not</b> have a backrest' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "no"
+    },
+    {
+      "key": "seats",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'seats' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "seats:separated",
+      "description": "Layer 'Artworks' shows seats:separated=no with a fixed text, namely 'This bench does not have separated seats' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "no"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'material' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=wood with a fixed text, namely 'The seating is made from wood' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "wood"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=metal with a fixed text, namely 'The seating is made from metal' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "metal"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=stone with a fixed text, namely 'The seating is made from stone' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "stone"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=concrete with a fixed text, namely 'The seating is made from concrete' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "concrete"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=plastic with a fixed text, namely 'The seating is made from plastic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "plastic"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=steel with a fixed text, namely 'The seating is made from steel' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "steel"
+    },
+    {
+      "key": "direction",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'colour' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=brown with a fixed text, namely 'Colour: brown' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "brown"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=green with a fixed text, namely 'Colour: green' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "green"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=gray with a fixed text, namely 'Colour: gray' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "gray"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=white with a fixed text, namely 'Colour: white' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "white"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=red with a fixed text, namely 'Colour: red' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "red"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=black with a fixed text, namely 'Colour: black' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "black"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=blue with a fixed text, namely 'Colour: blue' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "blue"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=yellow with a fixed text, namely 'Colour: yellow' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "yellow"
+    },
+    {
+      "key": "survey:date",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "survey:date",
+      "description": "Layer 'Artworks' shows survey:date= with a fixed text, namely 'Surveyed today!' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map') Picking this answer will delete the key survey:date.",
+      "value": ""
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'inscription' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "not:inscription",
+      "description": "Layer 'Artworks' shows not:inscription=yes with a fixed text, namely 'This bench does not have an inscription' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "yes"
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Artworks' shows  with a fixed text, namely 'This bench does <span class='subtle'>(probably)</span> not have an inscription' (in the MapComplete.osm.be theme 'Open Artwork Map') Picking this answer will delete the key inscription.",
+      "value": ""
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Artworks' shows historic=memorial with a fixed text, namely 'This bench is a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "memorial"
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map') Picking this answer will delete the key historic.",
+      "value": ""
+    },
+    {
+      "key": "not:historic",
+      "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "memorial"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/TagInfo/mapcomplete_benches.json b/Docs/TagInfo/mapcomplete_benches.json
index bd82b4b774..f2e0c77afb 100644
--- a/Docs/TagInfo/mapcomplete_benches.json
+++ b/Docs/TagInfo/mapcomplete_benches.json
@@ -10,6 +10,75 @@
     "contact_email": "pietervdvn@posteo.net"
   },
   "tags": [
+    {
+      "key": "leisure",
+      "description": "The MapComplete theme Benches has a layer Picnic tables showing features with this tag",
+      "value": "picnic_table"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Picnic tables 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 'Picnic tables 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 'Picnic tables 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 'Picnic tables 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": "level",
+      "description": "Layer 'Picnic tables' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Benches')"
+    },
+    {
+      "key": "location",
+      "description": "Layer 'Picnic tables' shows location=underground with a fixed text, namely 'Located underground' (in the MapComplete.osm.be theme 'Benches')",
+      "value": "underground"
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Picnic tables' shows level=0 with a fixed text, namely 'Located on the ground floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "0"
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Picnic tables' shows  with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Benches') Picking this answer will delete the key level.",
+      "value": ""
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Picnic tables' shows level=1 with a fixed text, namely 'Located on the first floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "1"
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Picnic tables' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "-1"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Picnic tables' shows and asks freeform values for key 'material' (in the MapComplete.osm.be theme 'Benches')"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Picnic tables' shows material=wood with a fixed text, namely 'This is a wooden picnic table' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "wood"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Picnic tables' shows material=concrete with a fixed text, namely 'This is a concrete picnic table' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "concrete"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Picnic tables' shows material=plastic with a fixed text, namely 'This picnic table is made from (recycled) plastic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "plastic"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Benches has a layer Benches showing features with this tag",
@@ -45,6 +114,11 @@
       "key": "seats",
       "description": "Layer 'Benches' shows and asks freeform values for key 'seats' (in the MapComplete.osm.be theme 'Benches')"
     },
+    {
+      "key": "seats:separated",
+      "description": "Layer 'Benches' shows seats:separated=no with a fixed text, namely 'This bench does not have separated seats' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "no"
+    },
     {
       "key": "material",
       "description": "Layer 'Benches' shows and asks freeform values for key 'material' (in the MapComplete.osm.be theme 'Benches')"
@@ -136,6 +210,50 @@
       "description": "Layer 'Benches' shows survey:date= with a fixed text, namely 'Surveyed today!' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') Picking this answer will delete the key survey:date.",
       "value": ""
     },
+    {
+      "key": "inscription",
+      "description": "Layer 'Benches' shows and asks freeform values for key 'inscription' (in the MapComplete.osm.be theme 'Benches')"
+    },
+    {
+      "key": "not:inscription",
+      "description": "Layer 'Benches' shows not:inscription=yes with a fixed text, namely 'This bench does not have an inscription' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "yes"
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Benches' shows  with a fixed text, namely 'This bench does <span class='subtle'>(probably)</span> not have an inscription' (in the MapComplete.osm.be theme 'Benches') Picking this answer will delete the key inscription.",
+      "value": ""
+    },
+    {
+      "key": "tourism",
+      "description": "Layer 'Benches' shows tourism=artwork with a fixed text, namely 'This bench has an integrated artwork' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "artwork"
+    },
+    {
+      "key": "tourism",
+      "description": "Layer 'Benches' shows  with a fixed text, namely 'This bench does not have an integrated artwork' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') Picking this answer will delete the key tourism.",
+      "value": ""
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Benches' shows historic=memorial with a fixed text, namely 'This bench is a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "memorial"
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches') Picking this answer will delete the key historic.",
+      "value": ""
+    },
+    {
+      "key": "not:historic",
+      "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
+      "value": "memorial"
+    },
+    {
+      "key": "highway",
+      "description": "The MapComplete theme Benches has a layer Benches at public transport stops showing features with this tag",
+      "value": "bus_stop"
+    },
     {
       "key": "bench",
       "description": "The MapComplete theme Benches has a layer Benches at public transport stops showing features with this tag",
@@ -180,75 +298,6 @@
       "key": "bench",
       "description": "Layer 'Benches at public transport stops' shows bench=no with a fixed text, namely 'There is no bench here' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
       "value": "no"
-    },
-    {
-      "key": "leisure",
-      "description": "The MapComplete theme Benches has a layer Picnic tables showing features with this tag",
-      "value": "picnic_table"
-    },
-    {
-      "key": "image",
-      "description": "The layer 'Picnic tables 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 'Picnic tables 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 'Picnic tables 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 'Picnic tables 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": "level",
-      "description": "Layer 'Picnic tables' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Benches')"
-    },
-    {
-      "key": "location",
-      "description": "Layer 'Picnic tables' shows location=underground with a fixed text, namely 'Located underground' (in the MapComplete.osm.be theme 'Benches')",
-      "value": "underground"
-    },
-    {
-      "key": "level",
-      "description": "Layer 'Picnic tables' shows level=0 with a fixed text, namely 'Located on the ground floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
-      "value": "0"
-    },
-    {
-      "key": "level",
-      "description": "Layer 'Picnic tables' shows  with a fixed text, namely 'Located on the ground floor' (in the MapComplete.osm.be theme 'Benches') Picking this answer will delete the key level.",
-      "value": ""
-    },
-    {
-      "key": "level",
-      "description": "Layer 'Picnic tables' shows level=1 with a fixed text, namely 'Located on the first floor' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
-      "value": "1"
-    },
-    {
-      "key": "level",
-      "description": "Layer 'Picnic tables' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
-      "value": "-1"
-    },
-    {
-      "key": "material",
-      "description": "Layer 'Picnic tables' shows and asks freeform values for key 'material' (in the MapComplete.osm.be theme 'Benches')"
-    },
-    {
-      "key": "material",
-      "description": "Layer 'Picnic tables' shows material=wood with a fixed text, namely 'This is a wooden picnic table' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
-      "value": "wood"
-    },
-    {
-      "key": "material",
-      "description": "Layer 'Picnic tables' shows material=concrete with a fixed text, namely 'This is a concrete picnic table' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
-      "value": "concrete"
-    },
-    {
-      "key": "material",
-      "description": "Layer 'Picnic tables' shows material=plastic with a fixed text, namely 'This picnic table is made from (recycled) plastic' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Benches')",
-      "value": "plastic"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json
index 010611a9f5..1912fb424c 100644
--- a/Docs/TagInfo/mapcomplete_food.json
+++ b/Docs/TagInfo/mapcomplete_food.json
@@ -301,6 +301,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
@@ -331,6 +346,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Restaurants and fast food' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Restaurants and fast food')",
diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json
index 78009f34cc..c41f4c364c 100644
--- a/Docs/TagInfo/mapcomplete_fritures.json
+++ b/Docs/TagInfo/mapcomplete_fritures.json
@@ -305,6 +305,21 @@
       "description": "Layer 'Fries shop' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Fries shop' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
@@ -335,6 +350,21 @@
       "description": "Layer 'Fries shop' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Fries shop' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Fries shop' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Fries shops')",
diff --git a/Docs/TagInfo/mapcomplete_healthcare.json b/Docs/TagInfo/mapcomplete_healthcare.json
index c37550acd0..f912896b0a 100644
--- a/Docs/TagInfo/mapcomplete_healthcare.json
+++ b/Docs/TagInfo/mapcomplete_healthcare.json
@@ -15,16 +15,6 @@
       "description": "The MapComplete theme Healthcare has a layer Doctors showing features with this tag",
       "value": "doctors"
     },
-    {
-      "key": "amenity",
-      "description": "The MapComplete theme Healthcare has a layer Doctors showing features with this tag",
-      "value": "dentist"
-    },
-    {
-      "key": "healthcare",
-      "description": "The MapComplete theme Healthcare has a layer Doctors showing features with this tag",
-      "value": "physiotherapist"
-    },
     {
       "key": "image",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
@@ -41,10 +31,23 @@
       "key": "wikipedia",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
     },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
@@ -69,10 +72,6 @@
       "key": "contact:website",
       "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
-    {
-      "key": "name",
-      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
-    },
     {
       "key": "healthcare:speciality",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'healthcare:speciality' (in the MapComplete.osm.be theme 'Healthcare')"
@@ -97,6 +96,121 @@
       "description": "Layer 'Doctors' shows healthcare:speciality=paediatrics with a fixed text, namely 'This is a paediatrician' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
       "value": "paediatrics"
     },
+    {
+      "key": "healthcare",
+      "description": "The MapComplete theme Healthcare has a layer Physiotherapist showing features with this tag",
+      "value": "physiotherapist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Healthcare')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Physiotherapist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "amenity",
+      "description": "The MapComplete theme Healthcare has a layer Dentist showing features with this tag",
+      "value": "dentist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Dentist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Healthcare')"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Healthcare has a layer Hospitals showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json
index d983ec2336..7416d303f7 100644
--- a/Docs/TagInfo/mapcomplete_nature.json
+++ b/Docs/TagInfo/mapcomplete_nature.json
@@ -474,6 +474,11 @@
       "key": "seats",
       "description": "Layer 'Benches' shows and asks freeform values for key 'seats' (in the MapComplete.osm.be theme 'Into nature')"
     },
+    {
+      "key": "seats:separated",
+      "description": "Layer 'Benches' shows seats:separated=no with a fixed text, namely 'This bench does not have separated seats' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature')",
+      "value": "no"
+    },
     {
       "key": "material",
       "description": "Layer 'Benches' shows and asks freeform values for key 'material' (in the MapComplete.osm.be theme 'Into nature')"
@@ -565,6 +570,45 @@
       "description": "Layer 'Benches' shows survey:date= with a fixed text, namely 'Surveyed today!' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') Picking this answer will delete the key survey:date.",
       "value": ""
     },
+    {
+      "key": "inscription",
+      "description": "Layer 'Benches' shows and asks freeform values for key 'inscription' (in the MapComplete.osm.be theme 'Into nature')"
+    },
+    {
+      "key": "not:inscription",
+      "description": "Layer 'Benches' shows not:inscription=yes with a fixed text, namely 'This bench does not have an inscription' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature')",
+      "value": "yes"
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Benches' shows  with a fixed text, namely 'This bench does <span class='subtle'>(probably)</span> not have an inscription' (in the MapComplete.osm.be theme 'Into nature') Picking this answer will delete the key inscription.",
+      "value": ""
+    },
+    {
+      "key": "tourism",
+      "description": "Layer 'Benches' shows tourism=artwork with a fixed text, namely 'This bench has an integrated artwork' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature')",
+      "value": "artwork"
+    },
+    {
+      "key": "tourism",
+      "description": "Layer 'Benches' shows  with a fixed text, namely 'This bench does not have an integrated artwork' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') Picking this answer will delete the key tourism.",
+      "value": ""
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Benches' shows historic=memorial with a fixed text, namely 'This bench is a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature')",
+      "value": "memorial"
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature') Picking this answer will delete the key historic.",
+      "value": ""
+    },
+    {
+      "key": "not:historic",
+      "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Into nature')",
+      "value": "memorial"
+    },
     {
       "key": "leisure",
       "description": "The MapComplete theme Into nature has a layer Picnic tables showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json
index 0a04bd0e5e..4354b4d763 100644
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@@ -798,6 +798,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
@@ -828,6 +843,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Restaurants and fast food' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
@@ -2104,6 +2134,21 @@
       "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
       "value": "Telekom"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "no"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme OnWheels has a layer Toilets showing features with this tag",
@@ -2386,16 +2431,6 @@
       "description": "The MapComplete theme OnWheels has a layer Doctors showing features with this tag",
       "value": "doctors"
     },
-    {
-      "key": "amenity",
-      "description": "The MapComplete theme OnWheels has a layer Doctors showing features with this tag",
-      "value": "dentist"
-    },
-    {
-      "key": "healthcare",
-      "description": "The MapComplete theme OnWheels has a layer Doctors showing features with this tag",
-      "value": "physiotherapist"
-    },
     {
       "key": "image",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
@@ -2412,10 +2447,23 @@
       "key": "wikipedia",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'OnWheels')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'OnWheels')"
     },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'OnWheels')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'OnWheels')"
@@ -2440,10 +2488,6 @@
       "key": "contact:website",
       "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
-    {
-      "key": "name",
-      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'OnWheels')"
-    },
     {
       "key": "healthcare:speciality",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'healthcare:speciality' (in the MapComplete.osm.be theme 'OnWheels')"
diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json
index 0ea23825dc..7cdb86e432 100644
--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
@@ -4752,18 +4752,61 @@
     },
     {
       "key": "amenity",
-      "description": "The MapComplete theme Personal theme has a layer Doctors showing features with this tag",
-      "value": "doctors"
+      "description": "The MapComplete theme Personal theme has a layer Dentist showing features with this tag",
+      "value": "dentist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Dentist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Dentist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Dentist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Dentist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "amenity",
       "description": "The MapComplete theme Personal theme has a layer Doctors showing features with this tag",
-      "value": "dentist"
-    },
-    {
-      "key": "healthcare",
-      "description": "The MapComplete theme Personal theme has a layer Doctors showing features with this tag",
-      "value": "physiotherapist"
+      "value": "doctors"
     },
     {
       "key": "image",
@@ -4781,10 +4824,23 @@
       "key": "wikipedia",
       "description": "The layer 'Doctors allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
     },
+    {
+      "key": "name",
+      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
     },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Doctors' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "phone",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
@@ -4809,10 +4865,6 @@
       "key": "contact:website",
       "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
-    {
-      "key": "name",
-      "description": "Layer 'Doctors' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
-    },
     {
       "key": "healthcare:speciality",
       "description": "Layer 'Doctors' shows and asks freeform values for key 'healthcare:speciality' (in the MapComplete.osm.be theme 'Personal theme')"
@@ -5974,6 +6026,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
@@ -6004,6 +6071,21 @@
       "description": "Layer 'Restaurants and fast food' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Restaurants and fast food' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Restaurants and fast food' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
@@ -7656,6 +7738,68 @@
       "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')",
       "value": "limited"
     },
+    {
+      "key": "healthcare",
+      "description": "The MapComplete theme Personal theme has a layer Physiotherapist showing features with this tag",
+      "value": "physiotherapist"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Physiotherapist allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "\"by appointment\""
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Physiotherapist' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "phone",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:phone",
+      "description": "Layer 'Physiotherapist' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "email",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:email",
+      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "website",
+      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'website' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "contact:website",
+      "description": "Layer 'Physiotherapist' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "leisure",
       "description": "The MapComplete theme Personal theme has a layer Picnic tables showing features with this tag",
@@ -9646,6 +9790,21 @@
       "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "Telekom"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "no"
+    },
     {
       "key": "highway",
       "description": "The MapComplete theme Personal theme has a layer Speed Camera showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json
index 94cbd41ae1..3fef14742b 100644
--- a/Docs/TagInfo/mapcomplete_pets.json
+++ b/Docs/TagInfo/mapcomplete_pets.json
@@ -371,6 +371,21 @@
       "description": "Layer 'Dog friendly eateries' shows diet:halal=only with a fixed text, namely 'Only halal options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
       "value": "only"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=no with a fixed text, namely 'There are no organic options available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=yes with a fixed text, namely 'There is an organic menu' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=only with a fixed text, namely 'Only organic options are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "only"
+    },
     {
       "key": "diet:vegetarian",
       "description": "Layer 'Dog friendly eateries' shows diet:vegetarian=yes with a fixed text, namely 'Vegetarian snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
@@ -401,6 +416,21 @@
       "description": "Layer 'Dog friendly eateries' shows diet:vegan=no with a fixed text, namely 'No vegan snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
       "value": "no"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=yes with a fixed text, namely 'Organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=no with a fixed text, namely 'No organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "no"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog friendly eateries' shows organic=only with a fixed text, namely 'Only organic snacks are available' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "only"
+    },
     {
       "key": "friture:oil",
       "description": "Layer 'Dog friendly eateries' shows friture:oil=vegetable with a fixed text, namely 'The frying is done with vegetable oil' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
@@ -1499,6 +1529,21 @@
       "description": "Layer 'Dog-friendly shops' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
       "value": "Telekom"
     },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog-friendly shops' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog-friendly shops' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Dog-friendly shops' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "no"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Veterinarians, dog parks and other pet-amenities has a layer veterinary showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_shops.json b/Docs/TagInfo/mapcomplete_shops.json
index 4f2f75f582..51a566b1be 100644
--- a/Docs/TagInfo/mapcomplete_shops.json
+++ b/Docs/TagInfo/mapcomplete_shops.json
@@ -979,6 +979,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 '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",
diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json
index 0a5055498e..5bba319e4b 100644
--- a/Docs/TagInfo/mapcomplete_sports.json
+++ b/Docs/TagInfo/mapcomplete_sports.json
@@ -1453,6 +1453,21 @@
       "key": "internet_access:ssid",
       "description": "Layer 'Shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
       "value": "Telekom"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=yes with a fixed text, namely 'This shop offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
+      "value": "yes"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=only with a fixed text, namely 'This shop only offers organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
+      "value": "only"
+    },
+    {
+      "key": "organic",
+      "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Sports')",
+      "value": "no"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/Themes/benches.md b/Docs/Themes/benches.md
index d6feb9a077..ae4a55f9a2 100644
--- a/Docs/Themes/benches.md
+++ b/Docs/Themes/benches.md
@@ -11,9 +11,9 @@ This theme contains the following layers:
 
 
 
+  - [picnic_table](../Layers/picnic_table.md)
   - [bench](../Layers/bench.md)
   - [bench_at_pt](../Layers/bench_at_pt.md)
-  - [picnic_table](../Layers/picnic_table.md)
   - [gps_location](../Layers/gps_location.md)
   - [gps_location_history](../Layers/gps_location_history.md)
   - [home_location](../Layers/home_location.md)
diff --git a/Docs/Themes/healthcare.md b/Docs/Themes/healthcare.md
index 0c44ac0972..ad9eecf4b1 100644
--- a/Docs/Themes/healthcare.md
+++ b/Docs/Themes/healthcare.md
@@ -12,6 +12,8 @@ This theme contains the following layers:
 
 
   - [doctors](../Layers/doctors.md)
+  - [physiotherapist](../Layers/physiotherapist.md)
+  - [dentist](../Layers/dentist.md)
   - [hospital](../Layers/hospital.md)
   - [pharmacy](../Layers/pharmacy.md)
   - [gps_location](../Layers/gps_location.md)
diff --git a/Docs/Themes/personal.md b/Docs/Themes/personal.md
index 317f1f7901..c792755e4a 100644
--- a/Docs/Themes/personal.md
+++ b/Docs/Themes/personal.md
@@ -37,6 +37,7 @@ This theme contains the following layers:
   - [crossings](../Layers/crossings.md)
   - [cycleways_and_roads](../Layers/cycleways_and_roads.md)
   - [defibrillator](../Layers/defibrillator.md)
+  - [dentist](../Layers/dentist.md)
   - [doctors](../Layers/doctors.md)
   - [dogpark](../Layers/dogpark.md)
   - [drinking_water](../Layers/drinking_water.md)
@@ -69,6 +70,7 @@ This theme contains the following layers:
   - [parking_spaces](../Layers/parking_spaces.md)
   - [pedestrian_path](../Layers/pedestrian_path.md)
   - [pharmacy](../Layers/pharmacy.md)
+  - [physiotherapist](../Layers/physiotherapist.md)
   - [picnic_table](../Layers/picnic_table.md)
   - [playground](../Layers/playground.md)
   - [postboxes](../Layers/postboxes.md)
diff --git a/Docs/Themes/sports.md b/Docs/Themes/sports.md
index e890dd5c94..17a29c9922 100644
--- a/Docs/Themes/sports.md
+++ b/Docs/Themes/sports.md
@@ -15,7 +15,7 @@ This theme contains the following layers:
   - [fitness_centre](../Layers/fitness_centre.md)
   - [fitness_station](../Layers/fitness_station.md)
   - [sports_centre](../Layers/sports_centre.md)
-  - [shops](../Layers/shops.md)
+  - [sport_shops](../Layers/sport_shops.md)
   - [gps_location](../Layers/gps_location.md)
   - [gps_location_history](../Layers/gps_location_history.md)
   - [home_location](../Layers/home_location.md)

From aae19f8110bd1deeecec1cc76e2bde6dc09dbeb5 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 03:41:54 +0100
Subject: [PATCH 16/23] Add generation of documentation on filters

---
 Models/ThemeConfig/FilterConfig.ts | 20 ++++++++++++++++++++
 Models/ThemeConfig/LayerConfig.ts  |  6 ++++++
 2 files changed, 26 insertions(+)

diff --git a/Models/ThemeConfig/FilterConfig.ts b/Models/ThemeConfig/FilterConfig.ts
index 5d7fe2e820..5e83577dfa 100644
--- a/Models/ThemeConfig/FilterConfig.ts
+++ b/Models/ThemeConfig/FilterConfig.ts
@@ -10,6 +10,9 @@ import { FilterState } from "../FilteredLayer"
 import { QueryParameters } from "../../Logic/Web/QueryParameters"
 import { Utils } from "../../Utils"
 import { RegexTag } from "../../Logic/Tags/RegexTag"
+import BaseUIElement from "../../UI/BaseUIElement";
+import Table from "../../UI/Base/Table";
+import Combine from "../../UI/Base/Combine";
 
 export default class FilterConfig {
     public readonly id: string
@@ -242,4 +245,21 @@ export default class FilterConfig {
             reset
         )
     }
+
+    public GenerateDocs(): BaseUIElement {
+        const hasField = this.options.some(opt => opt.fields?.length > 0)
+        return new Table(
+            Utils.NoNull(["id","question","osmTags",hasField ? "fields" : undefined]),
+            this.options.map((opt, i) => {
+                const isDefault = this.options.length > 1 && ((this.defaultSelection ?? 0) == i)
+                return Utils.NoNull([
+                    this.id + "." + i,
+                    isDefault ? new Combine([opt.question.SetClass("font-bold"), "(default)"]) : opt.question ,
+                    opt.osmTags?.asHumanString(false, false, {}) ?? "",
+                   opt.fields?.length > 0 ?  new Combine(opt.fields.map(f => f.name+" ("+f.type+")")) : undefined
+
+                ]);
+            })
+        );
+    }
 }
diff --git a/Models/ThemeConfig/LayerConfig.ts b/Models/ThemeConfig/LayerConfig.ts
index b725ea4c21..172a614c8d 100644
--- a/Models/ThemeConfig/LayerConfig.ts
+++ b/Models/ThemeConfig/LayerConfig.ts
@@ -601,6 +601,11 @@ export default class LayerConfig extends WithContextLoader {
             }
         }
 
+        const filterDocs: (string | BaseUIElement)[]  = []
+        if(this.filters.length > 0){
+            filterDocs.push(new Title("Filters", 4))
+            filterDocs.push(...this.filters.map(filter => filter.GenerateDocs()))
+        }
         return new Combine([
             new Combine([new Title(this.id, 1), iconImg, this.description, "\n"]).SetClass(
                 "flex flex-col"
@@ -615,6 +620,7 @@ export default class LayerConfig extends WithContextLoader {
             new Title("Supported attributes", 2),
             quickOverview,
             ...this.tagRenderings.map((tr) => tr.GenerateDocumentation()),
+            ...filterDocs
         ])
             .SetClass("flex-col")
             .SetClass("link-underline")

From aec5ffba798fe8ac37eb33aa1a03f8ee7ad4f9a0 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 03:42:32 +0100
Subject: [PATCH 17/23] Smoothen markdown-output of tables

---
 UI/Base/Table.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/UI/Base/Table.ts b/UI/Base/Table.ts
index 1fd2d1edc9..080566c421 100644
--- a/UI/Base/Table.ts
+++ b/UI/Base/Table.ts
@@ -26,10 +26,10 @@ export default class Table extends BaseUIElement {
 
     AsMarkdown(): string {
         const headerMarkdownParts = this._header.map((hel) => hel?.AsMarkdown() ?? " ")
-        const header = headerMarkdownParts.join(" | ")
+        const header = Utils.NoNull(headerMarkdownParts).join(" | ")
         const headerSep = headerMarkdownParts.map((part) => "-".repeat(part.length + 2)).join(" | ")
         const table = this._contents
-            .map((row) => row.map((el) => el.AsMarkdown() ?? " ").join(" | "))
+            .map((row) => row.map((el) => el?.AsMarkdown()?.replace("|", "\\|") ?? " ").join(" | "))
             .join("\n")
 
         return "\n\n" + [header, headerSep, table, ""].join("\n")

From 9e97eba519b625af2e27219a07b3dab0c79560bc Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 03:43:54 +0100
Subject: [PATCH 18/23] Add 'scrollIntoView' to baseUIElement, autoscroll
 questions into view when appropriate

---
 UI/BaseUIElement.ts              | 30 ++++++++++++++++++++++++++
 UI/Popup/EditableTagRendering.ts | 36 ++++++++++++++++++++------------
 UI/Popup/QuestionBox.ts          |  8 +++++++
 Utils.ts                         | 17 +++++++++++++++
 4 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/UI/BaseUIElement.ts b/UI/BaseUIElement.ts
index 40feef7bf2..dbf73e57e6 100644
--- a/UI/BaseUIElement.ts
+++ b/UI/BaseUIElement.ts
@@ -3,6 +3,8 @@
  *
  * Assumes a read-only configuration, so it has no 'ListenTo'
  */
+import {Utils} from "../Utils";
+
 export default abstract class BaseUIElement {
     protected _constructedHtmlElement: HTMLElement
     protected isDestroyed = false
@@ -41,6 +43,34 @@ export default abstract class BaseUIElement {
         this._constructedHtmlElement?.scrollTo(0, 0)
     }
 
+    public ScrollIntoView(options?: {
+        onlyIfPartiallyHidden?: boolean
+    }) {
+        if(this._constructedHtmlElement === undefined){
+            return
+        }
+        let alignToTop = true;
+        if(options?.onlyIfPartiallyHidden){
+            // Is the element completely in the view?
+            const parentRect = Utils.findParentWithScrolling(this._constructedHtmlElement.parentElement).getBoundingClientRect();
+            const elementRect = this._constructedHtmlElement.getBoundingClientRect();
+
+            // Check if the element is within the vertical bounds of the parent element
+            const topIsVisible = elementRect.top >= parentRect.top
+            const bottomIsVisible = elementRect.bottom <= parentRect.bottom
+            const inView = topIsVisible && bottomIsVisible ;
+            if(inView){
+                return
+            }
+            if(topIsVisible){
+                alignToTop = false
+            }
+        }
+        this._constructedHtmlElement?.scrollIntoView({
+            behavior: "smooth",
+            block: "start"
+        })
+    }
     /**
      * Adds all the relevant classes, space separated
      */
diff --git a/UI/Popup/EditableTagRendering.ts b/UI/Popup/EditableTagRendering.ts
index ec119f668b..177e144b81 100644
--- a/UI/Popup/EditableTagRendering.ts
+++ b/UI/Popup/EditableTagRendering.ts
@@ -1,16 +1,15 @@
-import { UIEventSource } from "../../Logic/UIEventSource"
+import {UIEventSource} from "../../Logic/UIEventSource"
 import TagRenderingQuestion from "./TagRenderingQuestion"
 import Translations from "../i18n/Translations"
 import Combine from "../Base/Combine"
 import TagRenderingAnswer from "./TagRenderingAnswer"
-import Svg from "../../Svg"
 import Toggle from "../Input/Toggle"
 import BaseUIElement from "../BaseUIElement"
 import TagRenderingConfig from "../../Models/ThemeConfig/TagRenderingConfig"
-import { Unit } from "../../Models/Unit"
+import {Unit} from "../../Models/Unit"
 import Lazy from "../Base/Lazy"
-import { FixedUiElement } from "../Base/FixedUiElement"
-import { EditButton } from "./SaveButton"
+import {FixedUiElement} from "../Base/FixedUiElement"
+import {EditButton} from "./SaveButton"
 
 export default class EditableTagRendering extends Toggle {
     constructor(
@@ -31,10 +30,9 @@ export default class EditableTagRendering extends Toggle {
                 configuration.IsKnown(tags) &&
                 (configuration?.condition?.matchesProperties(tags) ?? true)
         )
-
+        const editMode = options.editMode ?? new UIEventSource<boolean>(false)
         super(
             new Lazy(() => {
-                const editMode = options.editMode ?? new UIEventSource<boolean>(false)
                 let rendering = EditableTagRendering.CreateRendering(
                     state,
                     tags,
@@ -54,6 +52,13 @@ export default class EditableTagRendering extends Toggle {
             undefined,
             renderingIsShown
         )
+        const self = this;
+        editMode.addCallback(editing => {
+            if(editing){
+                console.log("Scrolling etr into view")
+                self.ScrollIntoView()
+            }
+        })
     }
 
     private static CreateRendering(
@@ -69,12 +74,6 @@ export default class EditableTagRendering extends Toggle {
 
         if (configuration.question !== undefined && state?.featureSwitchUserbadge?.data) {
             // We have a question and editing is enabled
-            const answerWithEditButton = new Combine([
-                answer,
-                new EditButton(state.osmConnection, () => {
-                    editMode.setData(true)
-                }),
-            ]).SetClass("flex justify-between w-full")
 
             const question = new Lazy(
                 () =>
@@ -92,7 +91,18 @@ export default class EditableTagRendering extends Toggle {
                     })
             )
 
+             const answerWithEditButton = new Combine([
+                answer,
+                new EditButton(state.osmConnection, () => {
+                    editMode.setData(true)
+                    question.ScrollIntoView({
+                        onlyIfPartiallyHidden:true
+                    })
+
+                }),
+            ]).SetClass("flex justify-between w-full")
             rendering = new Toggle(question, answerWithEditButton, editMode)
+
         }
         return rendering
     }
diff --git a/UI/Popup/QuestionBox.ts b/UI/Popup/QuestionBox.ts
index 0a5d324ef7..30d48fd67c 100644
--- a/UI/Popup/QuestionBox.ts
+++ b/UI/Popup/QuestionBox.ts
@@ -33,6 +33,8 @@ export default class QuestionBox extends VariableUiElement {
             .filter((tr) => tr.question !== undefined)
             .filter((tr) => tr.question !== null)
 
+        let focus: () => void = () => {};
+
         const tagRenderingQuestions = tagRenderings.map(
             (tagRendering, i) =>
                 new Lazy(
@@ -42,6 +44,7 @@ export default class QuestionBox extends VariableUiElement {
                             afterSave: () => {
                                 // We save and indicate progress by pinging and recalculating
                                 skippedQuestions.ping()
+                                focus()
                             },
                             cancelButton: Translations.t.general.skip
                                 .Clone()
@@ -49,6 +52,8 @@ export default class QuestionBox extends VariableUiElement {
                                 .onClick(() => {
                                     skippedQuestions.data.push(i)
                                     skippedQuestions.ping()
+                                    focus()
+
                                 }),
                         })
                 )
@@ -136,5 +141,8 @@ export default class QuestionBox extends VariableUiElement {
 
         this.skippedQuestions = skippedQuestions
         this.restingQuestions = questionsToAsk
+        focus = () => this.ScrollIntoView({
+            onlyIfPartiallyHidden: true
+        })
     }
 }
diff --git a/Utils.ts b/Utils.ts
index f708943c38..3fa4c6fb19 100644
--- a/Utils.ts
+++ b/Utils.ts
@@ -1,4 +1,5 @@
 import * as colors from "./assets/colors.json"
+import HTML = Mocha.reporters.HTML;
 
 export class Utils {
     /**
@@ -1221,4 +1222,20 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
         d.setUTCMilliseconds(0)
         d.setUTCMinutes(0)
     }
+
+    public static findParentWithScrolling(element: HTMLElement): HTMLElement {
+        // Check if the element itself has scrolling
+        if (element.scrollHeight > element.clientHeight) {
+            return element;
+        }
+
+        // If the element does not have scrolling, check if it has a parent element
+        if (!element.parentElement) {
+            return null;
+        }
+
+        // If the element has a parent, repeat the process for the parent element
+        return Utils.findParentWithScrolling(element.parentElement);
+    }
+
 }

From 569179ba4fc49dc8a9b9d2b7f3b8c6770e032c56 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 03:59:33 +0100
Subject: [PATCH 19/23] Borrow artwork questions in bench and vice versa

---
 assets/layers/artwork/artwork.json | 44 ++++++++++++++-
 assets/layers/bench/bench.json     | 88 +++++++++++++++++++++++++-----
 2 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index 3f47bf4b59..9c7af91cc9 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -127,6 +127,7 @@
   "tagRenderings": [
     "images",
     {
+      "labels": ["artwork-question"],
       "render": {
         "en": "This is a {artwork_type}",
         "nl": "Dit is een {artwork_type}",
@@ -448,6 +449,7 @@
     },
     {
       "id": "artwork-artist-wikidata",
+      "labels": ["artwork-question"],
       "render": {
         "en": "This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
         "de": "Dieses Kunstwerk wurde geschaffen von {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}",
@@ -518,7 +520,8 @@
         "key": "artist_name"
       },
       "condition": "artist:wikidata=",
-      "id": "artwork-artist_name"
+      "id": "artwork-artist_name",
+      "labels": ["artwork-question"]
     },
     {
       "question": {
@@ -561,7 +564,8 @@
         "key": "website",
         "type": "url"
       },
-      "id": "artwork-website"
+      "id": "artwork-website",
+      "labels": ["artwork-question"]
     },
     "wikipedia",
     {
@@ -586,6 +590,40 @@
         "cs": "Toto dílo zobrazuje {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
         "pt": "A obra de arte representa {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}",
         "es": "Esta obra de arte representa {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}"
+      },
+      "labels": ["artwork-question"]
+    },
+    {
+      "id": "doubles_as_bench",
+      "question": {
+        "en": "Does this artwork serve as a bench?"
+      },
+      "mappings": [
+        {
+          "if": "amenity=bench",
+          "then": {
+            "en": "This artwork also serves as a bench"
+          }
+        },
+        {
+          "if": "amenity=",
+          "then": {
+            "en": "This artwork does not serve as a bench"
+          }
+        },
+        {
+          "if": "amenity!=bench",
+          "then": {
+            "en": "This artwork does not serve as a bench"
+          },
+          "hideInAnswer": true
+        }
+      ]
+    },
+    {
+      "builtin": "bench.*bench-questions",
+      "override": {
+        "condition": "amenity=bench"
       }
     }
   ],
@@ -624,4 +662,4 @@
   "filter": [
     "has_image"
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/bench/bench.json b/assets/layers/bench/bench.json
index 01e640e1c2..709a2f838c 100644
--- a/assets/layers/bench/bench.json
+++ b/assets/layers/bench/bench.json
@@ -131,7 +131,10 @@
         "da": "Har denne bænk et ryglæn?",
         "cs": "Má tato lavička opěradlo?"
       },
-      "id": "bench-backrest"
+      "id": "bench-backrest",
+      "labels": [
+        "bench-questions"
+      ]
     },
     {
       "render": {
@@ -177,6 +180,9 @@
         "cs": "Kolik má tato lavice míst k sezení?"
       },
       "id": "bench-seats",
+      "labels": [
+        "bench-questions"
+      ],
       "mappings": [
         {
           "if": "seats:separated=no",
@@ -375,7 +381,10 @@
         "da": "Hvad er bænken (sædet) lavet af?",
         "cs": "Z čeho je vyrobena lavice (sedadlo)?"
       },
-      "id": "bench-material"
+      "id": "bench-material",
+      "labels": [
+        "bench-questions"
+      ]
     },
     {
       "question": {
@@ -416,6 +425,9 @@
         "key": "direction",
         "type": "direction"
       },
+      "labels": [
+        "bench-questions"
+      ],
       "id": "bench-direction"
     },
     {
@@ -656,6 +668,9 @@
           }
         }
       ],
+      "labels": [
+        "bench-questions"
+      ],
       "id": "bench-colour"
     },
     {
@@ -699,15 +714,21 @@
         {
           "if": "survey:date:={_now:date}",
           "then": {
-           "en": "Surveyed today!",
+            "en": "Surveyed today!",
             "nl": "Vandaag nagekeken!"
           }
         }
       ],
+      "labels": [
+        "bench-questions"
+      ],
       "id": "bench-survey:date"
     },
     {
       "id": "bench-inscription",
+      "labels": [
+        "bench-questions"
+      ],
       "render": {
         "en": "This bench does have the following inscription:<br/><p><i>{inscription}</i></p>",
         "nl": "Deze bank heeft een inscriptie: <br/><p><i>{inscription}</i></p>"
@@ -744,13 +765,40 @@
         }
       ]
     },
+    {
+      "id": "bench-artwork",
+      "question": {
+        "en": "Does this bench have an artistic element?<div class='subtle text-lg'>E.g. it has an integrated painting, statue or other non-trivial, creative work</div>",
+        "nl": "Heeft deze bank een geïntegreerd kunstwerk?<div class='subtle text-lg'>Bijvoorbeeld een standbeeld, schildering of ander, niet-triviaal kunstwerk</div>"
+      },
+      "mappings": [
+        {
+          "if": "tourism=artwork",
+          "then": {
+            "en": "This bench has an integrated artwork",
+            "nl": "Deze bank heeft een geïntegreerd kunstwerk"
+          }
+        },
+        {
+          "if": "tourism=",
+          "then": {
+            "en": "This bench does not have an integrated artwork",
+            "nl": "Deze bank heeft geen geïntegreerd kunstwerk"
+          }
+        }
+      ]
+    },
     {
       "id": "bench-memorial",
+      "labels": [
+        "bench-questions"
+      ],
       "condition": {
         "or": [
           "historic=memorial",
           "inscription~*",
-          "memorial=bench"
+          "memorial=bench",
+          "tourism=artwork"
         ]
       },
       "question": {
@@ -772,7 +820,6 @@
           "if": {
             "and": [
               "historic=",
-              "memorial=",
               "not:historic=memorial"
             ]
           },
@@ -781,11 +828,18 @@
             "nl": "Deze bank is <b>geen</b> gedenkteken aan iemand of iets"
           },
           "addExtraTags": [
-            "memorial=bench"
+            "memorial="
           ]
         }
       ]
+    },
+    {
+      "builtin": "artwork.*artwork-question",
+      "override": {
+        "condition": "tourism=artwork"
+      }
     }
+   
   ],
   "presets": [
     {
@@ -847,15 +901,19 @@
   "filter": [
     {
       "id": "bench_is_memorial",
-      "options": [{
-        "osmTags": {
-          "or": ["historic=memorial","memorial=bench"]
-        },
-        "question": {
-          "en": "is a memorial",
-          "nl": "is een gedenkteken"
+      "options": [
+        {
+          "osmTags": {
+            "or": [
+              "historic=memorial",
+              "memorial=bench"
+            ]
+          },
+          "question": {
+            "en": "is a memorial",
+            "nl": "is een gedenkteken"
+          }
         }
-      }
       ]
     },
     {
@@ -863,7 +921,7 @@
       "options": [
         {
           "question": {
-            "en":"With and without backrest",
+            "en": "With and without backrest",
             "nl": "Met en zonder rugleuning"
           }
         },

From 9da63df595e04040c0078ea2a89fed133168459a Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 03:59:41 +0100
Subject: [PATCH 20/23] Add hint for groups

---
 Models/ThemeConfig/Conversion/PrepareLayer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Models/ThemeConfig/Conversion/PrepareLayer.ts b/Models/ThemeConfig/Conversion/PrepareLayer.ts
index 2a66c054b2..134a740671 100644
--- a/Models/ThemeConfig/Conversion/PrepareLayer.ts
+++ b/Models/ThemeConfig/Conversion/PrepareLayer.ts
@@ -291,7 +291,7 @@ class ExpandTagRendering extends Conversion<
                             name +
                             " was not found.\n\tDid you mean one of " +
                             candidates.join(", ") +
-                            "?"
+                            "?\n(Hint: did you add a new label and are you trying to use this label at the same time? Run 'reset:layeroverview' first"
                     )
                     continue
                 }

From 8d2e0dcfc79d6a90483fa34519e4434001daf447 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Tue, 6 Dec 2022 04:08:18 +0100
Subject: [PATCH 21/23] Update leaflet to 1.9.2

---
 UI/Base/MinimapImplementation.ts |  4 ++--
 package-lock.json                | 14 +++++++-------
 package.json                     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/UI/Base/MinimapImplementation.ts b/UI/Base/MinimapImplementation.ts
index dec687ca1c..58c91cede6 100644
--- a/UI/Base/MinimapImplementation.ts
+++ b/UI/Base/MinimapImplementation.ts
@@ -158,13 +158,13 @@ export default class MinimapImplementation extends BaseUIElement implements Mini
             try {
                 self.InitMap()
             } catch (e) {
-                console.warn("Could not construct a minimap:", e)
+                console.debug("Could not construct a minimap:", e)
             }
 
             try {
                 self.leafletMap?.data?.invalidateSize()
             } catch (e) {
-                console.warn("Could not invalidate size of a minimap:", e)
+                console.debug("Could not invalidate size of a minimap:", e)
             }
         })
 
diff --git a/package-lock.json b/package-lock.json
index 499316e012..d66f17c1d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
         "idb-keyval": "^6.0.3",
         "jspdf": "^2.5.1",
         "latlon2country": "^1.2.6",
-        "leaflet": "^1.8.0",
+        "leaflet": "^1.9.2",
         "leaflet-polylineoffset": "^1.1.1",
         "leaflet-providers": "^1.13.0",
         "leaflet-simple-map-screenshoter": "^0.4.5",
@@ -9172,9 +9172,9 @@
       }
     },
     "node_modules/leaflet": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.8.0.tgz",
-      "integrity": "sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA=="
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.3.tgz",
+      "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ=="
     },
     "node_modules/leaflet-polylineoffset": {
       "version": "1.1.1",
@@ -23947,9 +23947,9 @@
       }
     },
     "leaflet": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.8.0.tgz",
-      "integrity": "sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA=="
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.3.tgz",
+      "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ=="
     },
     "leaflet-polylineoffset": {
       "version": "1.1.1",
diff --git a/package.json b/package.json
index 0922cd7786..3dddb05eed 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "idb-keyval": "^6.0.3",
     "jspdf": "^2.5.1",
     "latlon2country": "^1.2.6",
-    "leaflet": "^1.8.0",
+    "leaflet": "^1.9.2",
     "leaflet-polylineoffset": "^1.1.1",
     "leaflet-providers": "^1.13.0",
     "leaflet-simple-map-screenshoter": "^0.4.5",

From fed664c9bbfb98a501a265e415c76e09b6a8cc33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 03:10:01 +0000
Subject: [PATCH 22/23] Bump minimatch from 3.0.4 to 3.1.2

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d66f17c1d1..cd1f84d8ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9521,9 +9521,9 @@
       "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -24239,9 +24239,9 @@
       "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }

From 629df30d73576db10f7665a7fb7a905493f818f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 03:10:51 +0000
Subject: [PATCH 23/23] Bump decode-uri-component from 0.2.0 to 0.2.2

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d66f17c1d1..159d1ecaf4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5714,9 +5714,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10"
@@ -21222,9 +21222,9 @@
       }
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true
     },
     "decompress-response": {