chore: automated housekeeping...

2024-08-09 16:55:08 +02:00 · 2024-08-09 16:55:08 +02:00 · 6a0b77eb99
commit 6a0b77eb99
parent a8fd550b72
180 changed files with 16812 additions and 2509 deletions
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@ -12,6 +12,7 @@
 - animal_shelter
 - artwork
 - assembly_point
 - assisted_repair
 - atm
 - bank
 - barrier
@ -24,7 +25,6 @@
 - bike_cleaning
 - bike_parking
 - bike_repair_station
 - bike_shop
 - bike_themed_object
 - binocular
 - birdhide
@ -111,6 +111,7 @@
 - ticket_validator
 - toilet
 - toilet_at_amenity
 - tool_library
 - trail
 - transit_stops
 - tree_node
@ -131,7 +132,6 @@
 - bicycle_library
 - bicycle_rental
 - bike_cafe
 - bike_shop
 - bike_themed_object
 - brothel
 - cafe_pub
@ -183,7 +183,6 @@
 - bicycle_library
 - bicycle_rental
 - bike_cafe
 - bike_shop
 - bike_themed_object
 - cafe_pub
 - car_rental
@ -223,7 +222,6 @@
 - bicycle_library
 - bicycle_rental
 - bike_cafe
 - bike_shop
 - bike_themed_object
 - cafe_pub
 - car_rental
@ -254,7 +252,6 @@
 - bicycle_library
 - bicycle_rental
 - bike_cafe
 - bike_shop
 - bike_themed_object
 - cafe_pub
 - car_rental
@ -279,8 +276,10 @@
            ### opening_hours_by_appointment
             - animal_shelter
 - assisted_repair
 - doctors
 - physiotherapist
 - tool_library
            ### wikipedia
@ -290,11 +289,41 @@
 - nature_reserve
 - observation_tower
            ### memorial.memorial-questions
             - artwork
            ### bench.bench-questions
             - artwork
 - memorial
            ### preset_description
             - assisted_repair
 - ghost_bike
            ### contact
             - assisted_repair
 - brothel
 - cinema
 - hospital
 - ice_cream
 - love_hotel
 - stripclub
 - tool_library
            ### mastodon
             - assisted_repair
 - hackerspace
            ### facebook
             - assisted_repair
 - tool_library
            ### opening_hours_24_7
             - atm
@ -323,9 +352,9 @@
            ### description
             - bicycle_library
 - bike_shop
 - bike_themed_object
 - climbing_route
 - shops
 - toilet
 - toilet_at_amenity
@ -376,23 +405,10 @@
 - toilet_at_amenity
 - vending_machine
-            ### bicycle_rental.*bicycle_rental
+            ### shops.*
             - bike_shop
            ### bike_cleaning.bike_cleaning-service:bicycle:cleaning:charge
             - bike_shop
            ### contact
             - brothel
 - cinema
 - hospital
 - ice_cream
 - love_hotel
 - stripclub
            ### wheelchair-access
             - cafe_pub
@ -458,7 +474,6 @@
 - hackerspace
 - play_forest
 - playground
 - shops
 - sport_pitch
            ### climbing.website
@ -577,10 +592,6 @@
             - gps_track
            ### mastodon
             - hackerspace
            ### internet-all
             - hackerspace
@ -616,6 +627,14 @@
             - shops
            ### bicycle_rental.*bicycle_rental
             - shops
            ### bike_cleaning.bike_cleaning-service_bicycle_cleaning_charge
             - shops
            ### elongated_coin.designs
             - souvenir_coin
--- a/Docs/BuiltinQuestions.md
+++ b/Docs/BuiltinQuestions.md
@ -32,46 +32,48 @@ This is a special layer - data is not sourced from OpenStreetMap
 7. [reviews](#reviews)
 8. [phone](#phone)
 9. [mastodon](#mastodon)
-10. [osmlink](#osmlink)
+10. [facebook](#facebook)
-11. [email](#email)
+11. [osmlink](#osmlink)
-12. [website](#website)
+12. [email](#email)
-13. [wheelchair-access](#wheelchair-access)
+13. [website](#website)
-14. [dog-access](#dog-access)
+14. [wheelchair-access](#wheelchair-access)
-15. [description](#description)
+15. [dog-access](#dog-access)
-16. [opening_hours](#opening_hours)
+16. [description](#description)
-17. [Opening hours](#opening-hours)
+17. [opening_hours](#opening_hours)
-18. [opening_hours_24_7](#opening_hours_24_7)
+18. [Opening hours](#opening-hours)
-19. [Opening hours](#opening-hours)
+19. [opening_hours_24_7](#opening_hours_24_7)
-20. [opening_hours_24_7_default](#opening_hours_24_7_default)
+20. [Opening hours](#opening-hours)
-21. [Opening hours](#opening-hours)
+21. [opening_hours_24_7_default](#opening_hours_24_7_default)
-22. [opening_hours_by_appointment](#opening_hours_by_appointment)
+22. [Opening hours](#opening-hours)
-23. [Opening hours](#opening-hours)
+23. [opening_hours_by_appointment](#opening_hours_by_appointment)
-24. [service:electricity](#serviceelectricity)
+24. [Opening hours](#opening-hours)
-25. [payment-options](#payment-options)
+25. [service:electricity](#serviceelectricity)
-26. [payment-options-split](#payment-options-split)
+26. [payment-options](#payment-options)
-27. [payment-options-advanced](#payment-options-advanced)
+27. [payment-options-split](#payment-options-split)
-28. [denominations-coins](#denominations-coins)
+28. [payment-options-advanced](#payment-options-advanced)
-29. [denominations-notes](#denominations-notes)
+29. [denominations-coins](#denominations-coins)
-30. [all_tags](#all_tags)
+30. [denominations-notes](#denominations-notes)
-31. [multilevels](#multilevels)
+31. [all_tags](#all_tags)
-32. [repeated](#repeated)
+32. [multilevels](#multilevels)
-33. [single_level](#single_level)
+33. [repeated](#repeated)
-34. [smoking](#smoking)
+34. [single_level](#single_level)
-35. [induction-loop](#induction-loop)
+35. [smoking](#smoking)
-36. [internet](#internet)
+36. [induction-loop](#induction-loop)
-37. [internet-fee](#internet-fee)
+37. [internet](#internet)
-38. [internet-ssid](#internet-ssid)
+38. [internet-fee](#internet-fee)
-39. [luminous_or_lit](#luminous_or_lit)
+39. [internet-ssid](#internet-ssid)
-40. [survey_date](#survey_date)
+40. [luminous_or_lit](#luminous_or_lit)
-41. [check_date](#check_date)
+41. [survey_date](#survey_date)
-42. [sugar_free](#sugar_free)
+42. [check_date](#check_date)
-43. [lactose_free](#lactose_free)
+43. [sugar_free](#sugar_free)
-44. [gluten_free](#gluten_free)
+44. [lactose_free](#lactose_free)
-45. [vegan](#vegan)
+45. [gluten_free](#gluten_free)
-46. [lod](#lod)
+46. [vegan](#vegan)
-47. [split_button](#split_button)
+47. [lod](#lod)
-48. [seasonal](#seasonal)
+48. [split_button](#split_button)
-49. [shower](#shower)
+49. [seasonal](#seasonal)
 50. [shower](#shower)
 51. [preset_description](#preset_description)
 ## Supported attributes
@ -82,6 +84,7 @@ This is a special layer - data is not sourced from OpenStreetMap
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wikidata#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wikidata/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/contact:mastodon#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/contact%3Amastodon/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [contact:mastodon](https://wiki.openstreetmap.org/wiki/Key:contact:mastodon) | [fediverse](../SpecialInputElements.md#fediverse) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/contact:facebook#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/contact%3Afacebook/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [contact:facebook](https://wiki.openstreetmap.org/wiki/Key:contact:facebook) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/email#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/email/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
@ -90,7 +93,7 @@ This is a special layer - data is not sourced from OpenStreetMap
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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") |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:electricity#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Aelectricity/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/payment%3Acoins%3Adenominations/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/payment%3Anotes%3Adenominations/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF) |
@ -195,6 +198,14 @@ The question is `What is the Mastodon-handle of {title()}?`
 ### facebook
 Shows and asks for the facebook handle
 The question is `What is the facebook page of of {title()}?`
 *{link(Facebook page,&LBRACEcontact:facebook&RBRACE,,,)}<div class='subtle text-sm'>Facebook is known to harm mental health, manipulate public opinion and cause hate. Try to use healthier alternatives</div>* is shown if `contact:facebook` is set
 ### osmlink
 _This tagrendering has no question and is thus read-only_
@ -317,8 +328,9 @@ The question is `What are the opening hours of {title()}?`
 *<h3>Opening hours</h3>{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set
- -  *Only by appointment* is shown if 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>. _This option cannot be chosen as answer_
+ -  *Only by appointment* is shown if 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* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_
 -  *Marked as closed for an unspecified time* is shown if 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%3Dclosed' target='_blank'>closed</a>. _This option cannot be chosen as answer_
@ -520,10 +532,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
@ -708,4 +720,12 @@ The question is `Does this facility offer showers?`
 ### preset_description
 _This tagrendering has no question and is thus read-only_
 *{preset_description()}*
 This document is autogenerated from [assets/layers/questions/questions.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/questions/questions.json)
--- a/Docs/Layers/animal_shelter.md
+++ b/Docs/Layers/animal_shelter.md
@ -62,7 +62,7 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/email#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/email/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/purpose#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/purpose/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [purpose](https://wiki.openstreetmap.org/wiki/Key:purpose) | Multiple choice | [adoption](https://wiki.openstreetmap.org/wiki/Tag:purpose%3Dadoption) [sanctuary](https://wiki.openstreetmap.org/wiki/Tag:purpose%3Dsanctuary) [release](https://wiki.openstreetmap.org/wiki/Tag:purpose%3Drelease) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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") |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/animal_shelter#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/animal_shelter/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [animal_shelter](https://wiki.openstreetmap.org/wiki/Key:animal_shelter) | [string](../SpecialInputElements.md#string) | [dog](https://wiki.openstreetmap.org/wiki/Tag:animal_shelter%3Ddog) [cat](https://wiki.openstreetmap.org/wiki/Tag:animal_shelter%3Dcat) [horse](https://wiki.openstreetmap.org/wiki/Tag:animal_shelter%3Dhorse) [bird](https://wiki.openstreetmap.org/wiki/Tag:animal_shelter%3Dbird) [wildlife](https://wiki.openstreetmap.org/wiki/Tag:animal_shelter%3Dwildlife) |
@ -152,8 +152,9 @@ The question is `What are the opening hours of {title()}?`
 *<h3>Opening hours</h3>{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set
- -  *Only by appointment* is shown if 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>. _This option cannot be chosen as answer_
+ -  *Only by appointment* is shown if 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* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_
 -  *Marked as closed for an unspecified time* is shown if 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%3Dclosed' target='_blank'>closed</a>. _This option cannot be chosen as answer_
--- a/Docs/Layers/artwork.md
+++ b/Docs/Layers/artwork.md
@ -29,6 +29,9 @@ An open map of statues, busts, graffitis and other artwork all over the world
  - [artwork-website](#artwork-website)
  - [wikipedia](#wikipedia)
  - [artwork_subject](#artwork_subject)
  - [doubles_as_memorial](#doubles_as_memorial)
  - [memorial-type](#memorial-type)
  - [inscription](#inscription)
  - [doubles_as_bench](#doubles_as_bench)
  - [bench-backrest](#bench-backrest)
  - [bench-armrest](#bench-armrest)
@ -73,6 +76,9 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wikidata#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wikidata/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/subject:wikidata#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/subject%3Awikidata/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/historic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/historic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/memorial#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/memorial/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [memorial](https://wiki.openstreetmap.org/wiki/Key:memorial) | [string](../SpecialInputElements.md#string) | [statue](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstatue) [plaque](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dplaque) [bench](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dbench) [ghost_bike](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dghost_bike) [stolperstein](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstolperstein) [stele](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstele) [stone](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstone) [bust](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dbust) [sculpture](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dsculpture) [obelisk](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dobelisk) [cross](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dcross) [blue_plaque](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dblue_plaque) [tank](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dtank) [tree](https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dtree) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/inscription#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/inscription/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/amenity#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/amenity/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/backrest#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/backrest/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [backrest](https://wiki.openstreetmap.org/wiki/Key:backrest) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/armrest#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/armrest/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [armrest](https://wiki.openstreetmap.org/wiki/Key:armrest) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:armrest%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:armrest%3Dno) |
@ -169,6 +175,59 @@ This tagrendering is only visible in the popup if the following condition is met
 This tagrendering has labels 
 `artwork-question`
 ### doubles_as_memorial
 The question is `Does this artwork serve as a memorial?`
 -  *This artwork also serves as a memorial* is shown if 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 artwork does not serve as a bench* is shown if with historic=
 ### memorial-type
 The question is `What type of memorial is this?`
 *This is a {memorial}* is shown if `memorial` is set
 -  *This is a statue* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstatue' target='_blank'>statue</a>
 -  *This is a plaque* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dplaque' target='_blank'>plaque</a>
 -  *This is a commemorative bench* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dbench' target='_blank'>bench</a>
 -  *This is a ghost bike - a bicycle painted white to remember a cyclist whom deceased because of a car crash* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dghost_bike' target='_blank'>ghost_bike</a>
 -  *This is a stolperstein (stumbing stone)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstolperstein' target='_blank'>stolperstein</a>
 -  *This is a stele* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstele' target='_blank'>stele</a>
 -  *This is a memorial stone* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dstone' target='_blank'>stone</a>
 -  *This is a bust* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dbust' target='_blank'>bust</a>
 -  *This is a sculpture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dsculpture' target='_blank'>sculpture</a>
 -  *This is an obelisk* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dobelisk' target='_blank'>obelisk</a>
 -  *This is a cross* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dcross' target='_blank'>cross</a>
 -  *This is a blue plaque* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dblue_plaque' target='_blank'>blue_plaque</a>
 -  *This is a historic tank, permanently placed in public space as memorial* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dtank' target='_blank'>tank</a>
 -  *This is a memorial tree* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dtree' target='_blank'>tree</a>
 -  *This is a gravestone; the person is buried here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:historic' target='_blank'>historic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:historic%3Dtomb' target='_blank'>tomb</a>
 This tagrendering is only visible in the popup if the following condition is met: <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 tagrendering has labels 
 `memorial-questions`
 ### inscription
 The question is `What is the inscription on this memorial?`
 *The inscription on this memorial reads: <p><i>{inscription}<i></p>* is shown if `inscription` is set
 -  *This memorial does not have an inscription* is shown if 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 tagrendering is only visible in the popup if the following condition is met: <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> & memorial!=bench
 This tagrendering has labels 
 `memorial-questions`
 ### doubles_as_bench
 The question is `Does this artwork serve as a bench?`
@ -248,7 +307,7 @@ This tagrendering has labels
 The question is `In which direction are you looking when sitting on the bench?`
 *When sitting on the bench, one looks towards {direction}°.* is shown if `direction` is set
-This tagrendering is only visible in the popup if the following condition is met: <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 tagrendering is only visible in the popup if the following condition is met: <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> & two_sided!=yes
 This tagrendering has labels 
 `bench-questions`
@ -309,7 +368,7 @@ The question is `Does this bench act as memorial for someone or something?`
 -  *This bench is a <b>not</b> a memorial for someone or something* is shown if with historic= & <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: <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 tagrendering is only visible in the popup if the following condition is met: <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> & (<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> | <a href='https://wiki.openstreetmap.org/wiki/Key:memorial' target='_blank'>memorial</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:memorial%3Dbench' target='_blank'>bench</a> | <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> | inscription~.+)
 This tagrendering has labels 
 `bench-questions`
--- a/Docs/Layers/assisted_repair.md
+++ b/Docs/Layers/assisted_repair.md
@ -0,0 +1,217 @@
 [//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
 # assisted_repair
 A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location.  A repair café is a type of event organized regularly along the same principles.
 - This layer is shown at zoomlevel **1** and higher
 ## Table of contents
 1. [Themes using this layer](#themes-using-this-layer)
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
  - [images](#images)
  - [preset_description](#preset_description)
  - [name](#name)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
  - [Opening hours](#opening-hours)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
  - [mastodon](#mastodon)
  - [facebook](#facebook)
  - [item:repair](#itemrepair)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
  - [lod](#lod)
 ## Themes using this layer
 - [circular_economy](https://mapcomplete.org/circular_economy)
 - [personal](https://mapcomplete.org/personal)
 ## Basic tags for this layer
 Elements must match the expression **<a href='https://wiki.openstreetmap.org/wiki/Key:repair' target='_blank'>repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:repair%3Dassisted_self_service' target='_blank'>assisted_self_service</a>**
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22repair%22%3D%22assisted_self_service%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%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 |
 -----|-----|----- |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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") |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/email#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/email/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/contact:mastodon#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/contact%3Amastodon/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [contact:mastodon](https://wiki.openstreetmap.org/wiki/Key:contact:mastodon) | [fediverse](../SpecialInputElements.md#fediverse) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/contact:facebook#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/contact%3Afacebook/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [contact:facebook](https://wiki.openstreetmap.org/wiki/Key:contact:facebook) | [url](../SpecialInputElements.md#url) |  |
 ### images
 This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images
 _This tagrendering has no question and is thus read-only_
 *{image_carousel()}{image_upload()}*
 ### preset_description
 _This tagrendering has no question and is thus read-only_
 *{preset_description()}*
 ### name
 The question is `What is the name of this repair workshop?`
 *This workshop is called <b>{name}</b>* is shown if `name` is set
 ### opening_hours_by_appointment
 The question is `What are the opening hours of {title()}?`
 *<h3>Opening hours</h3>{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set
 -  *Only by appointment* is shown if 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* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_
 -  *Marked as closed for an unspecified time* is shown if 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%3Dclosed' target='_blank'>closed</a>. _This option cannot be chosen as answer_
 ### phone
 The question is `What is the phone number of {title()}?`
 *<a href='tel:{phone}'>{phone}</a>* is shown if `phone` is set
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/questions/phone.svg' style='width: 3rem; height: 3rem'> *<a href='tel:{contact:phone}'>{contact:phone}</a>* is shown if with contact:phone~.+. _This option cannot be chosen as answer_
 This tagrendering has labels 
 `contact`
 ### email
 The question is `What is the email address of {title()}?`
 *<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>* is shown if `email` is set
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/svg/envelope.svg' style='width: 3rem; height: 3rem'> *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>* is shown if with contact:email~.+. _This option cannot be chosen as answer_
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/svg/envelope.svg' style='width: 3rem; height: 3rem'> *<a href='mailto:{operator:email}' target='_blank' rel='noopener'>{operator:email}</a>* is shown if with operator:email~.+. _This option cannot be chosen as answer_
 This tagrendering has labels 
 `contact`
 ### website
 The question is `What is the website of {title()}?`
 *<a href='{website}' rel='nofollow noopener noreferrer' target='_blank'>{website}</a>* is shown if `website` is set
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/icons/website.svg' style='width: 3rem; height: 3rem'> *<a href='{contact:website}' rel='nofollow noopener noreferrer' target='_blank'>{contact:website}</a>* is shown if with contact:website~.+. _This option cannot be chosen as answer_
 This tagrendering has labels 
 `contact`
 ### mastodon
 Shows and asks for the mastodon handle
 The question is `What is the Mastodon-handle of {title()}?`
 *{fediverse_link(contact:mastodon)}* is shown if `contact:mastodon` is set
 ### facebook
 Shows and asks for the facebook handle
 The question is `What is the facebook page of of {title()}?`
 *{link(Facebook page,&LBRACEcontact:facebook&RBRACE,,,)}<div class='subtle text-sm'>Facebook is known to harm mental health, manipulate public opinion and cause hate. Try to use healthier alternatives</div>* is shown if `contact:facebook` is set
 ### item:repair
 The question is `What type of items are repaired here?`
 -  *Mobile phones are repaired here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:mobile_phone:repair' target='_blank'>service:mobile_phone:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:mobile_phone:repair%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:mobile_phone:repair' target='_blank'>service:mobile_phone:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:mobile_phone:repair%3Dno' target='_blank'>no</a>
 -  *Computers are repaired here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:computer:repair' target='_blank'>service:computer:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:computer:repair%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:computer:repair' target='_blank'>service:computer:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:computer:repair%3Dno' target='_blank'>no</a>
 -  *Bicycles are repaired here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair' target='_blank'>service:bicycle:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair' target='_blank'>service:bicycle:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno' target='_blank'>no</a>
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/recycling/small_electrical_appliances.svg' style='width: 3rem; height: 3rem'> *Electronic devices are repaired here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electronics:repair' target='_blank'>service:electronics:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electronics:repair%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:electronics:repair' target='_blank'>service:electronics:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electronics:repair%3Dno' target='_blank'>no</a>
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/recycling/furniture.svg' style='width: 3rem; height: 3rem'> *Furniture is repaired here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:furniture:repair' target='_blank'>service:furniture:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:furniture:repair%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:furniture:repair' target='_blank'>service:furniture:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:furniture:repair%3Dno' target='_blank'>no</a>
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/recycling/clothes.svg' style='width: 3rem; height: 3rem'> *Clothes are repaired here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:clothes:repair' target='_blank'>service:clothes:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:clothes:repair%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:clothes:repair' target='_blank'>service:clothes:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:clothes:repair%3Dno' target='_blank'>no</a>
 ### leftover-questions
 _This tagrendering has no question and is thus read-only_
 *{questions( ,)}*
 ### move-button
 _This tagrendering has no question and is thus read-only_
 *{move_button()}*
 ### delete-button
 _This tagrendering has no question and is thus read-only_
 *{delete_button()}*
 ### lod
 _This tagrendering has no question and is thus read-only_
 *{linked_data_from_website()}*
 This tagrendering has labels 
 `added_by_default`
 This document is autogenerated from [assets/layers/assisted_repair/assisted_repair.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/assisted_repair/assisted_repair.json)
--- a/Docs/Layers/bench.md
+++ b/Docs/Layers/bench.md
@ -47,6 +47,7 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer
 - [artwork](https://mapcomplete.org/artwork)
 - [benches](https://mapcomplete.org/benches)
 - [memorials](https://mapcomplete.org/memorials)
 - [nature](https://mapcomplete.org/nature)
--- a/Docs/Layers/bicycle_library.md
+++ b/Docs/Layers/bicycle_library.md
@ -41,6 +41,7 @@ A facility where bicycles can be lent for longer period of times
 - [bicyclelib](https://mapcomplete.org/bicyclelib)
 - [circular_economy](https://mapcomplete.org/circular_economy)
 - [cyclofix](https://mapcomplete.org/cyclofix)
 - [personal](https://mapcomplete.org/personal)
--- a/Docs/Layers/bike_cleaning.md
+++ b/Docs/Layers/bike_cleaning.md
@ -22,7 +22,7 @@ A layer showing facilities where one can clean their bike
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
  - [images](#images)
-  - [bike_cleaning-service:bicycle:cleaning:charge](#bike_cleaning-servicebicycle:cleaning:charge)
+  - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge)
  - [bike_cleaning-charge](#bike_cleaning-charge)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
@ -69,7 +69,7 @@ _This tagrendering has no question and is thus read-only_
-### bike_cleaning-service:bicycle:cleaning:charge
+### bike_cleaning-service_bicycle_cleaning_charge
 The question is `How much does it cost to use the cleaning service?`
 *Using the cleaning service costs {service:bicycle:cleaning:charge}* is shown if `service:bicycle:cleaning:charge` is set
--- a/Docs/Layers/bike_repair_station.md
+++ b/Docs/Layers/bike_repair_station.md
@ -47,6 +47,7 @@ A layer showing bicycle pumps and bicycle repair tool stands
 - [circular_economy](https://mapcomplete.org/circular_economy)
 - [cyclofix](https://mapcomplete.org/cyclofix)
 - [personal](https://mapcomplete.org/personal)
 - [toerisme_vlaanderen](https://mapcomplete.org/toerisme_vlaanderen)
--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
--- a/Docs/Layers/cafe_pub.md
+++ b/Docs/Layers/cafe_pub.md
@ -284,10 +284,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/climbing_gym.md
+++ b/Docs/Layers/climbing_gym.md
@ -373,10 +373,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/dentist.md
+++ b/Docs/Layers/dentist.md
@ -12,7 +12,7 @@ This layer shows dentist offices
- - This layer is shown at zoomlevel **13** and higher
+ - This layer is shown at zoomlevel **8** and higher
--- a/Docs/Layers/doctors.md
+++ b/Docs/Layers/doctors.md
@ -12,7 +12,7 @@ This layer shows doctor offices
- - This layer is shown at zoomlevel **13** and higher
+ - This layer is shown at zoomlevel **10** and higher
@ -58,7 +58,7 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik
 | attribute | type | values which are supported by this layer |
 -----|-----|----- |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) |  |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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") |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/email#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/email/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |  |
@ -89,8 +89,9 @@ The question is `What are the opening hours of {title()}?`
 *<h3>Opening hours</h3>{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set
- -  *Only by appointment* is shown if 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>. _This option cannot be chosen as answer_
+ -  *Only by appointment* is shown if 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* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_
 -  *Marked as closed for an unspecified time* is shown if 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%3Dclosed' target='_blank'>closed</a>. _This option cannot be chosen as answer_
@ -195,4 +196,17 @@ This tagrendering has labels
 | id | question | osmTags |
 -----|-----|----- |
 | specialty.0 | *What is this doctor specialized in?* (default) |  |
 | specialty.1 | This is a general practitioner | healthcare:speciality=general |
 | specialty.2 | This is a gynaecologist | healthcare:speciality=gynaecology |
 | specialty.3 | This is a psychiatrist | healthcare:speciality=psychiatry |
 | specialty.4 | This is a paediatrician | healthcare:speciality=paediatrics |
 This document is autogenerated from [assets/layers/doctors/doctors.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/doctors/doctors.json)
--- a/Docs/Layers/dogfoodb.md
+++ b/Docs/Layers/dogfoodb.md
@ -35,6 +35,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [single_level](#single_level)
  - [wheelchair-access](#wheelchair-access)
  - [Cuisine](#cuisine)
  - [show-menu-image](#show-menu-image)
  - [add-menu-image](#add-menu-image)
  - [menu-website](#menu-website)
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
@ -94,6 +97,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
@ -289,6 +293,30 @@ The question is `What kind of food is served here?`
 ### show-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_carousel(image:menu)}*
 ### add-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_upload(image:menu,Add an image from the menu)}*
 ### menu-website
 The question is `On what webpage is the menu published?`
 *{link(Consult the menu,&LBRACEwebsite:menu&RBRACE,,,)}* is shown if `website:menu` is set
 ### Reservation
 The question is `Is a reservation required for this place?`
@ -339,8 +367,8 @@ The question is `Does this restaurant have a vegetarian option?`
 -  *No vegetarian options are available* is shown if 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>
 -  *Some vegetarian options are available* is shown if 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%3Dlimited' target='_blank'>limited</a>
- -  *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
- -  *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if 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%3Don_demand' target='_blank'>on_demand</a>
@ -560,10 +588,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/dogshop.md
+++ b/Docs/Layers/dogshop.md
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@ -35,6 +35,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [single_level](#single_level)
  - [wheelchair-access](#wheelchair-access)
  - [Cuisine](#cuisine)
  - [show-menu-image](#show-menu-image)
  - [add-menu-image](#add-menu-image)
  - [menu-website](#menu-website)
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
@ -102,6 +105,7 @@ Elements must match **any** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
@ -297,6 +301,30 @@ The question is `What kind of food is served here?`
 ### show-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_carousel(image:menu)}*
 ### add-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_upload(image:menu,Add an image from the menu)}*
 ### menu-website
 The question is `On what webpage is the menu published?`
 *{link(Consult the menu,&LBRACEwebsite:menu&RBRACE,,,)}* is shown if `website:menu` is set
 ### Reservation
 The question is `Is a reservation required for this place?`
@ -347,8 +375,8 @@ The question is `Does this restaurant have a vegetarian option?`
 -  *No vegetarian options are available* is shown if 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>
 -  *Some vegetarian options are available* is shown if 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%3Dlimited' target='_blank'>limited</a>
- -  *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
- -  *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if 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%3Don_demand' target='_blank'>on_demand</a>
@ -568,10 +596,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/food_glutenfree.md
+++ b/Docs/Layers/food_glutenfree.md
@ -36,6 +36,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [single_level](#single_level)
  - [wheelchair-access](#wheelchair-access)
  - [Cuisine](#cuisine)
  - [show-menu-image](#show-menu-image)
  - [add-menu-image](#add-menu-image)
  - [menu-website](#menu-website)
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
@ -96,6 +99,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
@ -306,6 +310,30 @@ The question is `What kind of food is served here?`
 ### show-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_carousel(image:menu)}*
 ### add-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_upload(image:menu,Add an image from the menu)}*
 ### menu-website
 The question is `On what webpage is the menu published?`
 *{link(Consult the menu,&LBRACEwebsite:menu&RBRACE,,,)}* is shown if `website:menu` is set
 ### Reservation
 The question is `Is a reservation required for this place?`
@ -356,8 +384,8 @@ The question is `Does this restaurant have a vegetarian option?`
 -  *No vegetarian options are available* is shown if 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>
 -  *Some vegetarian options are available* is shown if 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%3Dlimited' target='_blank'>limited</a>
- -  *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
- -  *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if 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%3Don_demand' target='_blank'>on_demand</a>
@ -561,10 +589,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/food_lactosefree.md
+++ b/Docs/Layers/food_lactosefree.md
@ -36,6 +36,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [single_level](#single_level)
  - [wheelchair-access](#wheelchair-access)
  - [Cuisine](#cuisine)
  - [show-menu-image](#show-menu-image)
  - [add-menu-image](#add-menu-image)
  - [menu-website](#menu-website)
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
@ -96,6 +99,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
@ -306,6 +310,30 @@ The question is `What kind of food is served here?`
 ### show-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_carousel(image:menu)}*
 ### add-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_upload(image:menu,Add an image from the menu)}*
 ### menu-website
 The question is `On what webpage is the menu published?`
 *{link(Consult the menu,&LBRACEwebsite:menu&RBRACE,,,)}* is shown if `website:menu` is set
 ### Reservation
 The question is `Is a reservation required for this place?`
@ -356,8 +384,8 @@ The question is `Does this restaurant have a vegetarian option?`
 -  *No vegetarian options are available* is shown if 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>
 -  *Some vegetarian options are available* is shown if 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%3Dlimited' target='_blank'>limited</a>
- -  *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
- -  *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if 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%3Don_demand' target='_blank'>on_demand</a>
@ -561,10 +589,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@ -35,6 +35,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [single_level](#single_level)
  - [wheelchair-access](#wheelchair-access)
  - [Cuisine](#cuisine)
  - [show-menu-image](#show-menu-image)
  - [add-menu-image](#add-menu-image)
  - [menu-website](#menu-website)
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
@ -94,6 +97,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
@ -289,6 +293,30 @@ The question is `What kind of food is served here?`
 ### show-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_carousel(image:menu)}*
 ### add-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_upload(image:menu,Add an image from the menu)}*
 ### menu-website
 The question is `On what webpage is the menu published?`
 *{link(Consult the menu,&LBRACEwebsite:menu&RBRACE,,,)}* is shown if `website:menu` is set
 ### Reservation
 The question is `Is a reservation required for this place?`
@ -339,8 +367,8 @@ The question is `Does this restaurant have a vegetarian option?`
 -  *No vegetarian options are available* is shown if 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>
 -  *Some vegetarian options are available* is shown if 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%3Dlimited' target='_blank'>limited</a>
- -  *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
- -  *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if 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%3Don_demand' target='_blank'>on_demand</a>
@ -560,10 +588,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/ghost_bike.md
+++ b/Docs/Layers/ghost_bike.md
@ -21,7 +21,7 @@ A layer showing memorials for cyclists, killed in road accidents
 1. [Themes using this layer](#themes-using-this-layer)
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
-  - [ghost-bike-explanation](#ghost-bike-explanation)
+  - [preset_description](#preset_description)
  - [images](#images)
  - [ghost_bike-name](#ghost_bike-name)
  - [ghost_bike-source](#ghost_bike-source)
@ -64,10 +64,10 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik
-### ghost-bike-explanation
+### preset_description
 _This tagrendering has no question and is thus read-only_
-*A <b>ghost bike</b> is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location.*
+*{preset_description()}*
--- a/Docs/Layers/hackerspace.md
+++ b/Docs/Layers/hackerspace.md
@ -12,7 +12,7 @@ Hackerspace
- - This layer is shown at zoomlevel **8** and higher
+ - This layer is shown at zoomlevel **4** and higher
@ -393,10 +393,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/hotel.md
+++ b/Docs/Layers/hotel.md
@ -155,10 +155,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/medical_shops.md
+++ b/Docs/Layers/medical_shops.md
--- a/Docs/Layers/memorial.md
+++ b/Docs/Layers/memorial.md
@ -47,6 +47,7 @@ Layer showing memorial plaques, based upon a unofficial theme. Can be expanded t
 - [artwork](https://mapcomplete.org/artwork)
 - [memorials](https://mapcomplete.org/memorials)
 - [personal](https://mapcomplete.org/personal)
@ -117,7 +118,8 @@ The question is `What type of memorial is this?`
-
+This tagrendering has labels 
 `memorial-questions`
 ### inscription
@ -129,7 +131,8 @@ The question is `What is the inscription on this memorial?`
-
+This tagrendering has labels 
 `memorial-questions`
 ### memorial-wikidata
--- a/Docs/Layers/outdoor_seating.md
+++ b/Docs/Layers/outdoor_seating.md
@ -145,10 +145,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Layers/physiotherapist.md
+++ b/Docs/Layers/physiotherapist.md
@ -56,7 +56,7 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik
 | attribute | type | values which are supported by this layer |
 -----|-----|----- |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) |  |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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") |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/email#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/email/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |  |
@ -86,8 +86,9 @@ The question is `What are the opening hours of {title()}?`
 *<h3>Opening hours</h3>{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set
- -  *Only by appointment* is shown if 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>. _This option cannot be chosen as answer_
+ -  *Only by appointment* is shown if 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* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_
 -  *Marked as closed for an unspecified time* is shown if 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%3Dclosed' target='_blank'>closed</a>. _This option cannot be chosen as answer_
--- a/Docs/Layers/playground.md
+++ b/Docs/Layers/playground.md
@ -66,7 +66,7 @@ Elements must match **all** of the following expressions:
 | attribute | type | values which are supported by this layer |
 -----|-----|----- |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/surface#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/surface/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [surface](https://wiki.openstreetmap.org/wiki/Key:surface) | [string](../SpecialInputElements.md#string) | [grass](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dgrass) [sand](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dsand) [woodchips](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dwoodchips) [paving_stones](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dpaving_stones) [asphalt](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dasphalt) [concrete](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dconcrete) [tartan](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dtartan) [rubber](https://wiki.openstreetmap.org/wiki/Tag:surface%3Drubber) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/surface#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/surface/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [surface](https://wiki.openstreetmap.org/wiki/Key:surface) | [string](../SpecialInputElements.md#string) | [grass](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dgrass) [sand](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dsand) [woodchips](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dwoodchips) [paving_stones](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dpaving_stones) [asphalt](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dasphalt) [concrete](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dconcrete) [tartan](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dtartan) [rubber](https://wiki.openstreetmap.org/wiki/Tag:surface%3Drubber) [fine_gravel](https://wiki.openstreetmap.org/wiki/Tag:surface%3Dfine_gravel) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/lit#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/lit/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [lit](https://wiki.openstreetmap.org/wiki/Key:lit) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:lit%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:lit%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/min_age#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/min_age/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [min_age](https://wiki.openstreetmap.org/wiki/Key:min_age) | [nat](../SpecialInputElements.md#nat) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/max_age#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/max_age/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [max_age](https://wiki.openstreetmap.org/wiki/Key:max_age) | [pnat](../SpecialInputElements.md#pnat) |  |
@ -113,6 +113,7 @@ The question is `Which is the surface of this playground?`
 -  *The surface is <b>paved</b>* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:surface' target='_blank'>surface</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:surface%3Dpaved' target='_blank'>paved</a>. _This option cannot be chosen as answer_
 -  *The surface is tartan - a synthetic, springy surface typically seen on athletic pistes* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:surface' target='_blank'>surface</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:surface%3Dtartan' target='_blank'>tartan</a>
 -  *The surface is made from rubber, such as rubber tiles, rubber mulch or a big rubber area* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:surface' target='_blank'>surface</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:surface%3Drubber' target='_blank'>rubber</a>
 -  *The surface is <b>fine gravel</b> (less then 2 cm per stone)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:surface' target='_blank'>surface</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:surface%3Dfine_gravel' target='_blank'>fine_gravel</a>
--- a/Docs/Layers/public_bookcase.md
+++ b/Docs/Layers/public_bookcase.md
@ -43,6 +43,7 @@ A streetside cabinet with books, accessible to anyone
 - [bookcases](https://mapcomplete.org/bookcases)
 - [circular_economy](https://mapcomplete.org/circular_economy)
 - [personal](https://mapcomplete.org/personal)
--- a/Docs/Layers/shops.md
+++ b/Docs/Layers/shops.md
--- a/Docs/Layers/shops_glutenfree.md
+++ b/Docs/Layers/shops_glutenfree.md
--- a/Docs/Layers/shops_lactosefree.md
+++ b/Docs/Layers/shops_lactosefree.md
--- a/Docs/Layers/shops_second_hand.md
+++ b/Docs/Layers/shops_second_hand.md
--- a/Docs/Layers/shops_with_climbing_shoe_repair.md
+++ b/Docs/Layers/shops_with_climbing_shoe_repair.md
--- a/Docs/Layers/sport_shops.md
+++ b/Docs/Layers/sport_shops.md
--- a/Docs/Layers/toilet_at_amenity.md
+++ b/Docs/Layers/toilet_at_amenity.md
@ -55,9 +55,12 @@ A layer showing (public) toilets located at different places.
 ## Basic tags for this layer
-Elements must match the expression **<a href='https://wiki.openstreetmap.org/wiki/Key:toilets' target='_blank'>toilets</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:toilets%3Dyes' target='_blank'>yes</a>**
+Elements must match **all** of the following expressions:
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22toilets%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+0. <a href='https://wiki.openstreetmap.org/wiki/Key:toilets' target='_blank'>toilets</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:toilets%3Dyes' target='_blank'>yes</a>
 1. type!=route
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22toilets%22%3D%22yes%22%5D%5B%22type%22!%3D%22route%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 ## Supported attributes
--- a/Docs/Layers/tool_library.md
+++ b/Docs/Layers/tool_library.md
@ -0,0 +1,213 @@
 [//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
 # tool_library
 A tool library is a place where people from the general public can borrow tools
 - This layer is shown at zoomlevel **3** and higher
 ## Table of contents
 1. [Themes using this layer](#themes-using-this-layer)
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
  - [images](#images)
  - [phone](#phone)
  - [email](#email)
  - [website](#website)
  - [facebook](#facebook)
  - [opening_hours_by_appointment](#opening_hours_by_appointment)
  - [Opening hours](#opening-hours)
  - [membership](#membership)
  - [membership_charge](#membership_charge)
  - [fee](#fee)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
  - [lod](#lod)
 ## Themes using this layer
 - [circular_economy](https://mapcomplete.org/circular_economy)
 - [personal](https://mapcomplete.org/personal)
 ## Basic tags for this layer
 Elements must match the expression **<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtool_library' target='_blank'>tool_library</a>**
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22amenity%22%3D%22tool_library%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%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 |
 -----|-----|----- |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/email#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/email/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/contact:facebook#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/contact%3Afacebook/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [contact:facebook](https://wiki.openstreetmap.org/wiki/Key:contact:facebook) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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") |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/membership#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/membership/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [membership](https://wiki.openstreetmap.org/wiki/Key:membership) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:membership%3Dno) [required](https://wiki.openstreetmap.org/wiki/Tag:membership%3Drequired) [optional](https://wiki.openstreetmap.org/wiki/Tag:membership%3Doptional) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/charge:membership#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/charge%3Amembership/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [charge:membership](https://wiki.openstreetmap.org/wiki/Key:charge:membership) | [currency](../SpecialInputElements.md#currency) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/fee#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/fee/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [fee](https://wiki.openstreetmap.org/wiki/Key:fee) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno) [no](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes) [donation](https://wiki.openstreetmap.org/wiki/Tag:fee%3Ddonation) |
 ### images
 This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images
 _This tagrendering has no question and is thus read-only_
 *{image_carousel()}{image_upload()}*
 ### phone
 The question is `What is the phone number of {title()}?`
 *<a href='tel:{phone}'>{phone}</a>* is shown if `phone` is set
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/questions/phone.svg' style='width: 3rem; height: 3rem'> *<a href='tel:{contact:phone}'>{contact:phone}</a>* is shown if with contact:phone~.+. _This option cannot be chosen as answer_
 This tagrendering has labels 
 `contact`
 ### email
 The question is `What is the email address of {title()}?`
 *<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>* is shown if `email` is set
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/svg/envelope.svg' style='width: 3rem; height: 3rem'> *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>* is shown if with contact:email~.+. _This option cannot be chosen as answer_
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/svg/envelope.svg' style='width: 3rem; height: 3rem'> *<a href='mailto:{operator:email}' target='_blank' rel='noopener'>{operator:email}</a>* is shown if with operator:email~.+. _This option cannot be chosen as answer_
 This tagrendering has labels 
 `contact`
 ### website
 The question is `What is the website of {title()}?`
 *<a href='{website}' rel='nofollow noopener noreferrer' target='_blank'>{website}</a>* is shown if `website` is set
 - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/icons/website.svg' style='width: 3rem; height: 3rem'> *<a href='{contact:website}' rel='nofollow noopener noreferrer' target='_blank'>{contact:website}</a>* is shown if with contact:website~.+. _This option cannot be chosen as answer_
 This tagrendering has labels 
 `contact`
 ### facebook
 Shows and asks for the facebook handle
 The question is `What is the facebook page of of {title()}?`
 *{link(Facebook page,&LBRACEcontact:facebook&RBRACE,,,)}<div class='subtle text-sm'>Facebook is known to harm mental health, manipulate public opinion and cause hate. Try to use healthier alternatives</div>* is shown if `contact:facebook` is set
 ### opening_hours_by_appointment
 The question is `What are the opening hours of {title()}?`
 *<h3>Opening hours</h3>{opening_hours_table(opening_hours)}* is shown if `opening_hours` is set
 -  *Only by appointment* is shown if 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* is shown if with opening_hours~^("by appointment"|by appointment)$. _This option cannot be chosen as answer_
 -  *Marked as closed for an unspecified time* is shown if 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%3Dclosed' target='_blank'>closed</a>. _This option cannot be chosen as answer_
 ### membership
 The question is `Is a membership required to borrow tools here?`
 -  *No membership is required to borrow tools here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:membership' target='_blank'>membership</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:membership%3Dno' target='_blank'>no</a>
 -  *A <b>membership is required</b> to use this tool library* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:membership' target='_blank'>membership</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:membership%3Drequired' target='_blank'>required</a>
 -  *A <b>membership is possible</b> but not required to use this tool library* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:membership' target='_blank'>membership</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:membership%3Doptional' target='_blank'>optional</a>
 ### membership_charge
 The question is `How much does a membership cost?`
 *A membership costs {charge:membership}* is shown if `charge:membership` is set
 This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:membership' target='_blank'>membership</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:membership%3Drequired' target='_blank'>required</a>
 ### fee
 The question is `Is a fee asked to borrow tools?`
 -  *Borrowing tools is free (if one has a membership)* is shown if 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> & <a href='https://wiki.openstreetmap.org/wiki/Key:membership' target='_blank'>membership</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:membership%3Drequired' target='_blank'>required</a>
 -  *Borrowing tools is free* is shown if 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>
 -  *A fee is asked when borrowing tools* is shown if 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>
 -  *A donation can be given when borrowing tools* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Ddonation' target='_blank'>donation</a>
 ### leftover-questions
 _This tagrendering has no question and is thus read-only_
 *{questions( ,)}*
 ### move-button
 _This tagrendering has no question and is thus read-only_
 *{move_button()}*
 ### delete-button
 _This tagrendering has no question and is thus read-only_
 *{delete_button()}*
 ### lod
 _This tagrendering has no question and is thus read-only_
 *{linked_data_from_website()}*
 This tagrendering has labels 
 `added_by_default`
 This document is autogenerated from [assets/layers/tool_library/tool_library.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/tool_library/tool_library.json)
--- a/Docs/Schemas/DeleteConfigJson.schema.json
+++ b/Docs/Schemas/DeleteConfigJson.schema.json
@ -36,7 +36,15 @@
            "description": "The tags that will be given to the object.\nThis must remove tags so that the 'source/osmTags' won't match anymore\n\nquestion: What tags should be applied to the object?"
          },
          "then": {
-            "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?"
+            "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?",
            "anyOf": [
              {
                "$ref": "#/definitions/Record<string,string>"
              },
              {
                "type": "string"
              }
            ]
          }
        },
        "required": [
@ -115,6 +123,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
--- a/Docs/Schemas/DeleteConfigJsonJSC.ts
+++ b/Docs/Schemas/DeleteConfigJsonJSC.ts
@ -36,7 +36,15 @@ export default {
            "description": "The tags that will be given to the object.\nThis must remove tags so that the 'source/osmTags' won't match anymore\n\nquestion: What tags should be applied to the object?"
          },
          "then": {
-            "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?"
+            "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?",
            "anyOf": [
              {
                "$ref": "#/definitions/Record<string,string>"
              },
              {
                "type": "string"
              }
            ]
          }
        },
        "required": [
@ -114,6 +122,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
--- a/Docs/Schemas/DenominationConfigJson.schema.json
+++ b/Docs/Schemas/DenominationConfigJson.schema.json
@ -41,6 +41,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -56,10 +60,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/DenominationConfigJsonJSC.ts
+++ b/Docs/Schemas/DenominationConfigJsonJSC.ts
@ -40,6 +40,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -54,9 +57,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/ExtraLinkConfigJson.schema.json
+++ b/Docs/Schemas/ExtraLinkConfigJson.schema.json
@ -82,6 +82,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -96,10 +100,6 @@
        "or"
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    }
  },
  "$schema": "http://json-schema.org/draft-07/schema#",
--- a/Docs/Schemas/ExtraLinkConfigJsonJSC.ts
+++ b/Docs/Schemas/ExtraLinkConfigJsonJSC.ts
@ -81,6 +81,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -94,9 +97,6 @@ export default {
      "required": [
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    }
  },
  "$schema": "http://json-schema.org/draft-07/schema#"
--- a/Docs/Schemas/FilterConfigJson.schema.json
+++ b/Docs/Schemas/FilterConfigJson.schema.json
@ -103,6 +103,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -117,10 +121,6 @@
        "or"
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    }
  },
  "$schema": "http://json-schema.org/draft-07/schema#",
--- a/Docs/Schemas/FilterConfigJsonJSC.ts
+++ b/Docs/Schemas/FilterConfigJsonJSC.ts
@ -102,6 +102,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -115,9 +118,6 @@ export default {
      "required": [
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    }
  },
  "$schema": "http://json-schema.org/draft-07/schema#"
--- a/Docs/Schemas/IconConfigJson.schema.json
+++ b/Docs/Schemas/IconConfigJson.schema.json
@ -94,6 +94,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -109,10 +113,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/IconConfigJsonJSC.ts
+++ b/Docs/Schemas/IconConfigJsonJSC.ts
@ -93,6 +93,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -107,9 +110,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/LayerConfigJson.schema.json
+++ b/Docs/Schemas/LayerConfigJson.schema.json
@ -461,6 +461,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -476,10 +480,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
@ -1896,7 +1896,15 @@
                "description": "The tags that will be given to the object.\nThis must remove tags so that the 'source/osmTags' won't match anymore\n\nquestion: What tags should be applied to the object?"
              },
              "then": {
-                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?"
+                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?",
                "anyOf": [
                  {
                    "$ref": "#/definitions/Record<string,string>"
                  },
                  {
                    "type": "string"
                  }
                ]
              }
            },
            "required": [
--- a/Docs/Schemas/LayerConfigJsonJSC.ts
+++ b/Docs/Schemas/LayerConfigJsonJSC.ts
@ -460,6 +460,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -474,9 +477,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
@ -1879,7 +1879,15 @@ export default {
                "description": "The tags that will be given to the object.\nThis must remove tags so that the 'source/osmTags' won't match anymore\n\nquestion: What tags should be applied to the object?"
              },
              "then": {
-                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?"
+                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?",
                "anyOf": [
                  {
                    "$ref": "#/definitions/Record<string,string>"
                  },
                  {
                    "type": "string"
                  }
                ]
              }
            },
            "required": [
--- a/Docs/Schemas/LayoutConfigJson.schema.json
+++ b/Docs/Schemas/LayoutConfigJson.schema.json
@ -352,6 +352,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -367,10 +371,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
@ -1787,7 +1787,15 @@
                "description": "The tags that will be given to the object.\nThis must remove tags so that the 'source/osmTags' won't match anymore\n\nquestion: What tags should be applied to the object?"
              },
              "then": {
-                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?"
+                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?",
                "anyOf": [
                  {
                    "$ref": "#/definitions/Record<string,string>"
                  },
                  {
                    "type": "string"
                  }
                ]
              }
            },
            "required": [
--- a/Docs/Schemas/LayoutConfigJsonJSC.ts
+++ b/Docs/Schemas/LayoutConfigJsonJSC.ts
@ -351,6 +351,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -365,9 +368,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
@ -1770,7 +1770,15 @@ export default {
                "description": "The tags that will be given to the object.\nThis must remove tags so that the 'source/osmTags' won't match anymore\n\nquestion: What tags should be applied to the object?"
              },
              "then": {
-                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?"
+                "description": "The human explanation for the options\n\nquestion: What text should be shown to the contributor for this reason?",
                "anyOf": [
                  {
                    "$ref": "#/definitions/Record<string,string>"
                  },
                  {
                    "type": "string"
                  }
                ]
              }
            },
            "required": [
--- a/Docs/Schemas/LineRenderingConfigJson.schema.json
+++ b/Docs/Schemas/LineRenderingConfigJson.schema.json
@ -133,6 +133,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -148,10 +152,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/LineRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/LineRenderingConfigJsonJSC.ts
@ -132,6 +132,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -146,9 +149,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/MappingConfigJson.schema.json
+++ b/Docs/Schemas/MappingConfigJson.schema.json
@ -160,6 +160,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -175,10 +179,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/MappingConfigJsonJSC.ts
+++ b/Docs/Schemas/MappingConfigJsonJSC.ts
@ -159,6 +159,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -173,9 +176,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/MinimalTagRenderingConfigJson.schema.json
+++ b/Docs/Schemas/MinimalTagRenderingConfigJson.schema.json
@ -69,6 +69,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -83,10 +87,6 @@
        "or"
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    }
  },
  "$schema": "http://json-schema.org/draft-07/schema#",
--- a/Docs/Schemas/MinimalTagRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/MinimalTagRenderingConfigJsonJSC.ts
@ -68,6 +68,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -81,9 +84,6 @@ export default {
      "required": [
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    }
  },
  "$schema": "http://json-schema.org/draft-07/schema#"
--- a/Docs/Schemas/MoveConfigJson.schema.json
+++ b/Docs/Schemas/MoveConfigJson.schema.json
@ -51,6 +51,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -66,10 +70,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/MoveConfigJsonJSC.ts
+++ b/Docs/Schemas/MoveConfigJsonJSC.ts
@ -50,6 +50,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -64,9 +67,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/PointRenderingConfigJson.schema.json
+++ b/Docs/Schemas/PointRenderingConfigJson.schema.json
@ -207,6 +207,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -222,10 +226,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/PointRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/PointRenderingConfigJsonJSC.ts
@ -206,6 +206,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -220,9 +223,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
@ -276,6 +276,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -291,10 +295,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
@ -275,6 +275,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -289,9 +292,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/RewritableConfigJson.schema.json
+++ b/Docs/Schemas/RewritableConfigJson.schema.json
@ -87,6 +87,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -102,10 +106,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/RewritableConfigJsonJSC.ts
+++ b/Docs/Schemas/RewritableConfigJsonJSC.ts
@ -86,6 +86,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -100,9 +103,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/Schemas/TagRenderingConfigJson.schema.json
+++ b/Docs/Schemas/TagRenderingConfigJson.schema.json
@ -217,6 +217,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -232,10 +236,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/TagRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/TagRenderingConfigJsonJSC.ts
@ -216,6 +216,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -230,9 +233,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    }
--- a/Docs/Schemas/UnitConfigJson.schema.json
+++ b/Docs/Schemas/UnitConfigJson.schema.json
@ -73,6 +73,10 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -88,10 +92,6 @@
      ],
      "additionalProperties": false
    },
    "Record<string,string>": {
      "type": "object",
      "additionalProperties": false
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object",
      "additionalProperties": false
--- a/Docs/Schemas/UnitConfigJsonJSC.ts
+++ b/Docs/Schemas/UnitConfigJsonJSC.ts
@ -72,6 +72,9 @@ export default {
        "and"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "{or:TagConfigJson[];}": {
      "type": "object",
      "properties": {
@ -86,9 +89,6 @@ export default {
        "or"
      ]
    },
    "Record<string,string>": {
      "type": "object"
    },
    "Record<string,string|Record<string,string>>": {
      "type": "object"
    },
--- a/Docs/SpecialRenderings.md
+++ b/Docs/SpecialRenderings.md
@ -1358,6 +1358,16 @@ Shows a 'nothing is currently known-message if there is at least one unanswered
 <code>`{if_nothing_known(,)}`</code>
 ### preset_description
 Shows the extra description from the presets of the layer, if one matches. It will pick the most specific one (e.g. if preset `A` implies `B`, but `B` does not imply `A`, it'll pick B) or the first one if no ordering can be made. Might be empty
 #### Example usage of preset_description
 <code>`{preset_description()}`</code>
 ### auto_apply
 A button to run many actions for many features at once. To effectively use this button, you'll need some ingredients: 
--- a/Docs/TagInfo/mapcomplete_artwork.json
+++ b/Docs/TagInfo/mapcomplete_artwork.json
@ -133,6 +133,104 @@
      "key": "subject:wikidata",
      "description": "Layer 'Artworks' shows and asks freeform values for key 'subject:wikidata' (in the mapcomplete.org theme 'Artwork') (This is only shown if subject:wikidata~.+)"
    },
    {
      "key": "historic",
      "description": "Layer 'Artworks' shows historic=memorial with a fixed text, namely 'This artwork also serves as a memorial' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "memorial"
    },
    {
      "key": "historic",
      "description": "Layer 'Artworks' shows historic= 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.org theme 'Artwork') Picking this answer will delete the key historic.",
      "value": ""
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows and asks freeform values for key 'memorial' (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=statue with a fixed text, namely 'This is a statue' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "statue"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=plaque with a fixed text, namely 'This is a plaque' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "plaque"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=bench with a fixed text, namely 'This is a commemorative bench' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "bench"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=ghost_bike with a fixed text, namely 'This is a ghost bike - a bicycle painted white to remember a cyclist whom deceased because of a car crash' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "ghost_bike"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=stolperstein with a fixed text, namely 'This is a stolperstein (stumbing stone)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "stolperstein"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=stele with a fixed text, namely 'This is a stele' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "stele"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=stone with a fixed text, namely 'This is a memorial stone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "stone"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=bust with a fixed text, namely 'This is a bust' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "bust"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=sculpture with a fixed text, namely 'This is a sculpture' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "sculpture"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=obelisk with a fixed text, namely 'This is an obelisk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "obelisk"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=cross with a fixed text, namely 'This is a cross' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "cross"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=blue_plaque with a fixed text, namely 'This is a blue plaque' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "blue_plaque"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=tank with a fixed text, namely 'This is a historic tank, permanently placed in public space as memorial' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "tank"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=tree with a fixed text, namely 'This is a memorial tree' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "tree"
    },
    {
      "key": "historic",
      "description": "Layer 'Artworks' shows historic=tomb with a fixed text, namely 'This is a gravestone; the person is buried here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if historic=memorial)",
      "value": "tomb"
    },
    {
      "key": "inscription",
      "description": "Layer 'Artworks' shows and asks freeform values for key 'inscription' (in the mapcomplete.org theme 'Artwork') (This is only shown if memorial!=bench & historic=memorial)"
    },
    {
      "key": "not:inscription",
      "description": "Layer 'Artworks' shows not:inscription=yes with a fixed text, namely 'This memorial does not have an inscription' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if memorial!=bench & historic=memorial)",
      "value": "yes"
    },
    {
      "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.org theme 'Artwork')",
@ -218,7 +316,7 @@
    },
    {
      "key": "direction",
-      "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)"
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the mapcomplete.org theme 'Artwork') (This is only shown if two_sided!=yes & amenity=bench)"
    },
    {
      "key": "colour",
@ -289,18 +387,590 @@
    },
    {
      "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.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "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.org theme 'Artwork') (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork) & amenity=bench)",
      "value": "memorial"
    },
    {
      "key": "historic",
-      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Artwork') Picking this answer will delete the key historic. (This is only shown if amenity=bench)",
+      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Artwork') Picking this answer will delete the key historic. (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork) & amenity=bench)",
      "value": ""
    },
    {
      "key": "not:historic",
-      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Artwork') (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork) & amenity=bench)",
      "value": "memorial"
    },
    {
      "key": "memorial",
      "description": "The MapComplete theme Artwork has a layer Memorials showing features with this tag"
    },
    {
      "key": "historic",
      "description": "The MapComplete theme Artwork has a layer Memorials showing features with this tag",
      "value": "memorial"
    },
    {
      "key": "id",
      "description": "Layer 'Memorials' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Artwork') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
    },
    {
      "key": "image",
      "description": "The layer 'Memorials 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 'Memorials 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 'Memorials 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 'Memorials 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": "memorial",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'memorial' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=statue with a fixed text, namely 'This is a statue' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "statue"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=plaque with a fixed text, namely 'This is a plaque' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "plaque"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=bench with a fixed text, namely 'This is a commemorative bench' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "bench"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=ghost_bike with a fixed text, namely 'This is a ghost bike - a bicycle painted white to remember a cyclist whom deceased because of a car crash' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "ghost_bike"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=stolperstein with a fixed text, namely 'This is a stolperstein (stumbing stone)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "stolperstein"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=stele with a fixed text, namely 'This is a stele' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "stele"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=stone with a fixed text, namely 'This is a memorial stone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "stone"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=bust with a fixed text, namely 'This is a bust' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "bust"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=sculpture with a fixed text, namely 'This is a sculpture' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "sculpture"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=obelisk with a fixed text, namely 'This is an obelisk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "obelisk"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=cross with a fixed text, namely 'This is a cross' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "cross"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=blue_plaque with a fixed text, namely 'This is a blue plaque' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "blue_plaque"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=tank with a fixed text, namely 'This is a historic tank, permanently placed in public space as memorial' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "tank"
    },
    {
      "key": "memorial",
      "description": "Layer 'Memorials' shows memorial=tree with a fixed text, namely 'This is a memorial tree' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "tree"
    },
    {
      "key": "historic",
      "description": "Layer 'Memorials' shows historic=tomb with a fixed text, namely 'This is a gravestone; the person is buried here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "tomb"
    },
    {
      "key": "inscription",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'inscription' (in the mapcomplete.org theme 'Artwork') (This is only shown if memorial!=bench)"
    },
    {
      "key": "not:inscription",
      "description": "Layer 'Memorials' shows not:inscription=yes with a fixed text, namely 'This memorial does not have an inscription' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if memorial!=bench)",
      "value": "yes"
    },
    {
      "key": "wikidata",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'wikidata' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "key": "subject:wikidata",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'subject:wikidata' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "key": "start_date",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'start_date' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "key": "backrest",
      "description": "Layer 'Memorials' shows backrest=yes & two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "yes"
    },
    {
      "key": "two_sided",
      "description": "Layer 'Memorials' shows backrest=yes & two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "yes"
    },
    {
      "key": "backrest",
      "description": "Layer 'Memorials' shows backrest=yes with a fixed text, namely 'This bench does have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "yes"
    },
    {
      "key": "backrest",
      "description": "Layer 'Memorials' shows backrest=no with a fixed text, namely 'This bench does <b>not</b> have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "no"
    },
    {
      "key": "armrest",
      "description": "Layer 'Memorials' shows armrest=yes with a fixed text, namely 'This bench does have one or more armrests' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "yes"
    },
    {
      "key": "armrest",
      "description": "Layer 'Memorials' shows armrest=no with a fixed text, namely 'This bench does <b>not</b> have any armrests' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "no"
    },
    {
      "key": "seats",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'seats' (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)"
    },
    {
      "key": "seats:separated",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "no"
    },
    {
      "key": "material",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'material' (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)"
    },
    {
      "key": "material",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "wood"
    },
    {
      "key": "material",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "metal"
    },
    {
      "key": "material",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "stone"
    },
    {
      "key": "material",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "concrete"
    },
    {
      "key": "material",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "plastic"
    },
    {
      "key": "material",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "steel"
    },
    {
      "key": "direction",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'direction' (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench & two_sided!=yes)"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'colour' (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=brown with a fixed text, namely 'Colour: brown' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "brown"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=green with a fixed text, namely 'Colour: green' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "green"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=gray with a fixed text, namely 'Colour: gray' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "gray"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=white with a fixed text, namely 'Colour: white' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "white"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=red with a fixed text, namely 'Colour: red' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "red"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=black with a fixed text, namely 'Colour: black' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "black"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=blue with a fixed text, namely 'Colour: blue' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "blue"
    },
    {
      "key": "colour",
      "description": "Layer 'Memorials' shows colour=yellow with a fixed text, namely 'Colour: yellow' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "yellow"
    },
    {
      "key": "survey:date",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'survey:date' (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)"
    },
    {
      "key": "survey:date",
      "description": "Layer 'Memorials' shows survey:date= with a fixed text, namely 'Surveyed today!' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') Picking this answer will delete the key survey:date. (This is only shown if amenity=bench)",
      "value": ""
    },
    {
      "key": "inscription",
      "description": "Layer 'Memorials' shows and asks freeform values for key 'inscription' (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)"
    },
    {
      "key": "not:inscription",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench)",
      "value": "yes"
    },
    {
      "key": "inscription",
      "description": "Layer 'Memorials' shows inscription= with a fixed text, namely 'This bench <span class='subtle'>probably</span> does not not have an inscription' (in the mapcomplete.org theme 'Artwork') Picking this answer will delete the key inscription. (This is only shown if amenity=bench)",
      "value": ""
    },
    {
      "key": "historic",
      "description": "Layer 'Memorials' 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.org theme 'Artwork') (This is only shown if amenity=bench & (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork))",
      "value": "memorial"
    },
    {
      "key": "historic",
      "description": "Layer 'Memorials' shows historic= & 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.org theme 'Artwork') Picking this answer will delete the key historic. (This is only shown if amenity=bench & (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork))",
      "value": ""
    },
    {
      "key": "not:historic",
      "description": "Layer 'Memorials' shows historic= & 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.org theme 'Artwork') (This is only shown if amenity=bench & (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork))",
      "value": "memorial"
    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Artwork has a layer Benches showing features with this tag",
      "value": "bench"
    },
    {
      "key": "id",
      "description": "Layer 'Benches' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Artwork') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
    },
    {
      "key": "image",
      "description": "The layer 'Benches 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 'Benches 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 'Benches 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 'Benches 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": "backrest",
      "description": "Layer 'Benches' shows backrest=yes & two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "yes"
    },
    {
      "key": "two_sided",
      "description": "Layer 'Benches' shows backrest=yes & two_sided=yes with a fixed text, namely 'This bench is two-sided and shares the backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "yes"
    },
    {
      "key": "backrest",
      "description": "Layer 'Benches' shows backrest=yes with a fixed text, namely 'This bench does have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "yes"
    },
    {
      "key": "backrest",
      "description": "Layer 'Benches' shows backrest=no with a fixed text, namely 'This bench does <b>not</b> have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "no"
    },
    {
      "key": "armrest",
      "description": "Layer 'Benches' shows armrest=yes with a fixed text, namely 'This bench does have one or more armrests' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "yes"
    },
    {
      "key": "armrest",
      "description": "Layer 'Benches' shows armrest=no with a fixed text, namely 'This bench does <b>not</b> have any armrests' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "no"
    },
    {
      "key": "seats",
      "description": "Layer 'Benches' shows and asks freeform values for key 'seats' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "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.org theme 'Artwork')",
      "value": "no"
    },
    {
      "key": "material",
      "description": "Layer 'Benches' shows and asks freeform values for key 'material' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "key": "material",
      "description": "Layer 'Benches' 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.org theme 'Artwork')",
      "value": "wood"
    },
    {
      "key": "material",
      "description": "Layer 'Benches' 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.org theme 'Artwork')",
      "value": "metal"
    },
    {
      "key": "material",
      "description": "Layer 'Benches' 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.org theme 'Artwork')",
      "value": "stone"
    },
    {
      "key": "material",
      "description": "Layer 'Benches' 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.org theme 'Artwork')",
      "value": "concrete"
    },
    {
      "key": "material",
      "description": "Layer 'Benches' 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.org theme 'Artwork')",
      "value": "plastic"
    },
    {
      "key": "material",
      "description": "Layer 'Benches' 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.org theme 'Artwork')",
      "value": "steel"
    },
    {
      "key": "direction",
      "description": "Layer 'Benches' shows and asks freeform values for key 'direction' (in the mapcomplete.org theme 'Artwork') (This is only shown if two_sided!=yes)"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows and asks freeform values for key 'colour' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=brown with a fixed text, namely 'Colour: brown' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "brown"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=green with a fixed text, namely 'Colour: green' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "green"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=gray with a fixed text, namely 'Colour: gray' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "gray"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=white with a fixed text, namely 'Colour: white' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "white"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=red with a fixed text, namely 'Colour: red' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "red"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=black with a fixed text, namely 'Colour: black' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "black"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=blue with a fixed text, namely 'Colour: blue' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "blue"
    },
    {
      "key": "colour",
      "description": "Layer 'Benches' shows colour=yellow with a fixed text, namely 'Colour: yellow' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork')",
      "value": "yellow"
    },
    {
      "key": "survey:date",
      "description": "Layer 'Benches' shows and asks freeform values for key 'survey:date' (in the mapcomplete.org theme 'Artwork')"
    },
    {
      "key": "survey:date",
      "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.org theme 'Artwork') 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.org theme 'Artwork')"
    },
    {
      "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.org theme 'Artwork')",
      "value": "yes"
    },
    {
      "key": "inscription",
      "description": "Layer 'Benches' shows inscription= with a fixed text, namely 'This bench <span class='subtle'>probably</span> does not not have an inscription' (in the mapcomplete.org theme 'Artwork') 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.org theme 'Artwork')",
      "value": "artwork"
    },
    {
      "key": "not:tourism:artwork",
      "description": "Layer 'Benches' shows not:tourism:artwork=yes 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.org theme 'Artwork')",
      "value": "yes"
    },
    {
      "key": "tourism",
      "description": "Layer 'Benches' shows tourism= with a fixed text, namely 'This bench <span class=\"subtle\">probably</span> doesn't have an integrated artwork' (in the mapcomplete.org theme 'Artwork') 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.org theme 'Artwork') (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork))",
      "value": "memorial"
    },
    {
      "key": "historic",
      "description": "Layer 'Benches' shows historic= & 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.org theme 'Artwork') Picking this answer will delete the key historic. (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork))",
      "value": ""
    },
    {
      "key": "not:historic",
      "description": "Layer 'Benches' shows historic= & 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.org theme 'Artwork') (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork))",
      "value": "memorial"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows and asks freeform values for key 'artwork_type' (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=architecture with a fixed text, namely 'Architecture' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "architecture"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=mural with a fixed text, namely 'Mural' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "mural"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=painting with a fixed text, namely 'Painting' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "painting"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=sculpture with a fixed text, namely 'Sculpture' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "sculpture"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=statue with a fixed text, namely 'Statue' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "statue"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=bust with a fixed text, namely 'Bust' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "bust"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=stone with a fixed text, namely 'Stone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "stone"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=installation with a fixed text, namely 'Installation' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "installation"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=graffiti with a fixed text, namely 'Graffiti' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "graffiti"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=relief with a fixed text, namely 'Relief' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "relief"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=azulejo with a fixed text, namely 'Azulejo (Spanish decorative tilework)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "azulejo"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=tilework with a fixed text, namely 'Tilework' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "tilework"
    },
    {
      "key": "artwork_type",
      "description": "Layer 'Benches' shows artwork_type=woodcarving with a fixed text, namely 'Woodcarving' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)",
      "value": "woodcarving"
    },
    {
      "key": "artist:wikidata",
      "description": "Layer 'Benches' shows and asks freeform values for key 'artist:wikidata' (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)"
    },
    {
      "key": "artist_name",
      "description": "Layer 'Benches' shows and asks freeform values for key 'artist_name' (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)"
    },
    {
      "key": "website",
      "description": "Layer 'Benches' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)"
    },
    {
      "key": "subject:wikidata",
      "description": "Layer 'Benches' shows and asks freeform values for key 'subject:wikidata' (in the mapcomplete.org theme 'Artwork') (This is only shown if tourism=artwork)"
    }
  ]
 }
--- a/Docs/TagInfo/mapcomplete_circular_economy.json
+++ b/Docs/TagInfo/mapcomplete_circular_economy.json
--- a/Docs/TagInfo/mapcomplete_climbing.json
+++ b/Docs/TagInfo/mapcomplete_climbing.json
@ -748,8 +748,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -1577,17 +1577,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1726,6 +1726,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
@ -1850,6 +2046,10 @@
      "description": "Layer 'Shop' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Toilets showing features with this tag",
--- a/Docs/TagInfo/mapcomplete_cyclofix.json
+++ b/Docs/TagInfo/mapcomplete_cyclofix.json
--- a/Docs/TagInfo/mapcomplete_food.json
+++ b/Docs/TagInfo/mapcomplete_food.json
@ -234,6 +234,42 @@
      "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
      "value": "thai"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "mapillary",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikidata",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikipedia",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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": "website:menu",
      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'website:menu' (in the mapcomplete.org theme 'Restaurants and fast food')"
    },
    {
      "key": "reservation",
      "description": "Layer 'Restaurants and fast food' shows reservation=required with a fixed text, namely 'A reservation is required at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if takeaway!=only)",
--- a/Docs/TagInfo/mapcomplete_fritures.json
+++ b/Docs/TagInfo/mapcomplete_fritures.json
@ -238,6 +238,42 @@
      "description": "Layer 'Fries shop' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
      "value": "thai"
    },
    {
      "key": "image",
      "description": "The layer 'Fries shop shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "mapillary",
      "description": "The layer 'Fries shop shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikidata",
      "description": "The layer 'Fries shop shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikipedia",
      "description": "The layer 'Fries shop shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "image",
      "description": "The layer 'Fries shop 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 'Fries shop 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 'Fries shop 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 'Fries shop 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": "website:menu",
      "description": "Layer 'Fries shop' shows and asks freeform values for key 'website:menu' (in the mapcomplete.org theme 'Fries shops')"
    },
    {
      "key": "reservation",
      "description": "Layer 'Fries shop' shows reservation=required with a fixed text, namely 'A reservation is required at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops') (This is only shown if takeaway!=only)",
--- a/Docs/TagInfo/mapcomplete_glutenfree.json
+++ b/Docs/TagInfo/mapcomplete_glutenfree.json
@ -258,6 +258,42 @@
      "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
      "value": "thai"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "mapillary",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikidata",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikipedia",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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": "website:menu",
      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'website:menu' (in the mapcomplete.org theme 'Glutenfree')"
    },
    {
      "key": "reservation",
      "description": "Layer 'Restaurants and fast food' shows reservation=required with a fixed text, namely 'A reservation is required at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if takeaway!=only)",
@ -860,8 +896,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -1689,17 +1725,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1838,6 +1874,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Glutenfree') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
@ -1941,6 +2173,10 @@
      "key": "diet:lactose_free",
      "description": "Layer 'Shop' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Glutenfree')"
    }
  ]
 }
--- a/Docs/TagInfo/mapcomplete_healthcare.json
+++ b/Docs/TagInfo/mapcomplete_healthcare.json
@ -45,13 +45,18 @@
    },
    {
      "key": "opening_hours",
-      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' (in the mapcomplete.org theme 'Healthcare')",
+      "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.org 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.org theme 'Healthcare')"
    },
    {
      "key": "opening_hours",
      "description": "Layer 'Doctors' shows opening_hours=closed with a fixed text, namely 'Marked as closed for an unspecified time' (in the mapcomplete.org theme 'Healthcare')",
      "value": "closed"
    },
    {
      "key": "phone",
      "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the mapcomplete.org theme 'Healthcare')"
@ -139,13 +144,18 @@
    },
    {
      "key": "opening_hours",
-      "description": "Layer 'Physiotherapist' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' (in the mapcomplete.org theme 'Healthcare')",
+      "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.org 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.org theme 'Healthcare')"
    },
    {
      "key": "opening_hours",
      "description": "Layer 'Physiotherapist' shows opening_hours=closed with a fixed text, namely 'Marked as closed for an unspecified time' (in the mapcomplete.org theme 'Healthcare')",
      "value": "closed"
    },
    {
      "key": "phone",
      "description": "Layer 'Physiotherapist' shows and asks freeform values for key 'phone' (in the mapcomplete.org theme 'Healthcare')"
@ -440,8 +450,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -1269,17 +1279,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1418,6 +1428,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Healthcare') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Healthcare') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Healthcare') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Healthcare') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Healthcare') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Healthcare') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Healthcare') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Healthcare') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Healthcare') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Healthcare') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
@ -1541,6 +1747,10 @@
      "key": "diet:lactose_free",
      "description": "Layer 'Shop' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Healthcare')"
    }
  ]
 }
--- a/Docs/TagInfo/mapcomplete_lactosefree.json
+++ b/Docs/TagInfo/mapcomplete_lactosefree.json
@ -258,6 +258,42 @@
      "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
      "value": "thai"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "mapillary",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikidata",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikipedia",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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": "website:menu",
      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'website:menu' (in the mapcomplete.org theme 'Lactose free shops and restaurants')"
    },
    {
      "key": "reservation",
      "description": "Layer 'Restaurants and fast food' shows reservation=required with a fixed text, namely 'A reservation is required at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if takeaway!=only)",
@ -860,8 +896,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -1689,17 +1725,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1838,6 +1874,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Lactose free shops and restaurants') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
@ -1941,6 +2173,10 @@
      "key": "diet:gluten_free",
      "description": "Layer 'Shop' shows diet:gluten_free=no with a fixed text, namely 'This shop has no gluten free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Lactose free shops and restaurants')"
    }
  ]
 }
--- a/Docs/TagInfo/mapcomplete_memorials.json
+++ b/Docs/TagInfo/mapcomplete_memorials.json
@ -788,6 +788,104 @@
      "key": "subject:wikidata",
      "description": "Layer 'Artworks' shows and asks freeform values for key 'subject:wikidata' (in the mapcomplete.org theme 'Memorials') (This is only shown if subject:wikidata~.+)"
    },
    {
      "key": "historic",
      "description": "Layer 'Artworks' shows historic=memorial with a fixed text, namely 'This artwork also serves as a memorial' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials')",
      "value": "memorial"
    },
    {
      "key": "historic",
      "description": "Layer 'Artworks' shows historic= 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.org theme 'Memorials') Picking this answer will delete the key historic.",
      "value": ""
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows and asks freeform values for key 'memorial' (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=statue with a fixed text, namely 'This is a statue' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "statue"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=plaque with a fixed text, namely 'This is a plaque' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "plaque"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=bench with a fixed text, namely 'This is a commemorative bench' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "bench"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=ghost_bike with a fixed text, namely 'This is a ghost bike - a bicycle painted white to remember a cyclist whom deceased because of a car crash' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "ghost_bike"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=stolperstein with a fixed text, namely 'This is a stolperstein (stumbing stone)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "stolperstein"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=stele with a fixed text, namely 'This is a stele' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "stele"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=stone with a fixed text, namely 'This is a memorial stone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "stone"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=bust with a fixed text, namely 'This is a bust' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "bust"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=sculpture with a fixed text, namely 'This is a sculpture' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "sculpture"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=obelisk with a fixed text, namely 'This is an obelisk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "obelisk"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=cross with a fixed text, namely 'This is a cross' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "cross"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=blue_plaque with a fixed text, namely 'This is a blue plaque' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "blue_plaque"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=tank with a fixed text, namely 'This is a historic tank, permanently placed in public space as memorial' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "tank"
    },
    {
      "key": "memorial",
      "description": "Layer 'Artworks' shows memorial=tree with a fixed text, namely 'This is a memorial tree' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "tree"
    },
    {
      "key": "historic",
      "description": "Layer 'Artworks' shows historic=tomb with a fixed text, namely 'This is a gravestone; the person is buried here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if historic=memorial)",
      "value": "tomb"
    },
    {
      "key": "inscription",
      "description": "Layer 'Artworks' shows and asks freeform values for key 'inscription' (in the mapcomplete.org theme 'Memorials') (This is only shown if memorial!=bench & historic=memorial)"
    },
    {
      "key": "not:inscription",
      "description": "Layer 'Artworks' shows not:inscription=yes with a fixed text, namely 'This memorial does not have an inscription' and allows to pick this as a default answer (in the mapcomplete.org theme 'Memorials') (This is only shown if memorial!=bench & historic=memorial)",
      "value": "yes"
    },
    {
      "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.org theme 'Memorials')",
@ -873,7 +971,7 @@
    },
    {
      "key": "direction",
-      "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the mapcomplete.org theme 'Memorials') (This is only shown if amenity=bench)"
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the mapcomplete.org theme 'Memorials') (This is only shown if two_sided!=yes & amenity=bench)"
    },
    {
      "key": "colour",
@ -944,17 +1042,17 @@
    },
    {
      "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.org theme 'Memorials') (This is only shown if amenity=bench)",
+      "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.org theme 'Memorials') (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork) & amenity=bench)",
      "value": "memorial"
    },
    {
      "key": "historic",
-      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Memorials') Picking this answer will delete the key historic. (This is only shown if amenity=bench)",
+      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Memorials') Picking this answer will delete the key historic. (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork) & amenity=bench)",
      "value": ""
    },
    {
      "key": "not:historic",
-      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Memorials') (This is only shown if amenity=bench)",
+      "description": "Layer 'Artworks' shows historic= & 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.org theme 'Memorials') (This is only shown if (historic=memorial | inscription~.+ | memorial=bench | tourism=artwork) & amenity=bench)",
      "value": "memorial"
    }
  ]
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@ -758,6 +758,42 @@
      "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
      "value": "thai"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "mapillary",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikidata",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikipedia",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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": "website:menu",
      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'website:menu' (in the mapcomplete.org theme 'OnWheels')"
    },
    {
      "key": "reservation",
      "description": "Layer 'Restaurants and fast food' shows reservation=required with a fixed text, namely 'A reservation is required at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if takeaway!=only)",
@ -1397,8 +1433,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -2226,17 +2262,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -2375,6 +2411,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'OnWheels') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'OnWheels') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'OnWheels') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'OnWheels') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'OnWheels') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'OnWheels') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'OnWheels') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'OnWheels') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'OnWheels') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'OnWheels') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
@ -2499,6 +2731,10 @@
      "description": "Layer 'Shop' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'OnWheels')"
    },
    {
      "key": "amenity",
      "description": "The MapComplete theme OnWheels has a layer Toilets showing features with this tag",
@ -2902,13 +3138,18 @@
    },
    {
      "key": "opening_hours",
-      "description": "Layer 'Doctors' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' (in the mapcomplete.org theme 'OnWheels')",
+      "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.org 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.org theme 'OnWheels')"
    },
    {
      "key": "opening_hours",
      "description": "Layer 'Doctors' shows opening_hours=closed with a fixed text, namely 'Marked as closed for an unspecified time' (in the mapcomplete.org theme 'OnWheels')",
      "value": "closed"
    },
    {
      "key": "phone",
      "description": "Layer 'Doctors' shows and asks freeform values for key 'phone' (in the mapcomplete.org theme 'OnWheels')"
--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
--- a/Docs/TagInfo/mapcomplete_pets.json
+++ b/Docs/TagInfo/mapcomplete_pets.json
@ -330,6 +330,42 @@
      "description": "Layer 'Dog friendly eateries' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
      "value": "thai"
    },
    {
      "key": "image",
      "description": "The layer 'Dog friendly eateries shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "mapillary",
      "description": "The layer 'Dog friendly eateries shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikidata",
      "description": "The layer 'Dog friendly eateries shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikipedia",
      "description": "The layer 'Dog friendly eateries shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "image",
      "description": "The layer 'Dog friendly eateries 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 'Dog friendly eateries 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 'Dog friendly eateries 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 'Dog friendly eateries 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": "website:menu",
      "description": "Layer 'Dog friendly eateries' shows and asks freeform values for key 'website:menu' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
    },
    {
      "key": "reservation",
      "description": "Layer 'Dog friendly eateries' shows reservation=required with a fixed text, namely 'A reservation is required at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if takeaway!=only)",
@ -748,8 +784,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Dog-friendly shops' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if craft=)",
+      "description": "Layer 'Dog-friendly shops' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -1577,17 +1613,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Dog-friendly shops' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Dog-friendly shops' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Dog-friendly shops' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Dog-friendly shops' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Dog-friendly shops' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Dog-friendly shops' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1726,6 +1762,202 @@
      "description": "Layer 'Dog-friendly shops' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Dog-friendly shops' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Dog-friendly shops' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Dog-friendly shops' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
@ -1850,6 +2082,10 @@
      "description": "Layer 'Dog-friendly shops' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Veterinarians, dog parks and other pet-amenities has a layer veterinary showing features with this tag",
@ -1966,13 +2202,18 @@
    },
    {
      "key": "opening_hours",
-      "description": "Layer 'Animal shelters' shows opening_hours=\"by appointment\" with a fixed text, namely 'Only by appointment' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "description": "Layer 'Animal shelters' 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.org theme 'Veterinarians, dog parks and other pet-amenities')",
      "value": "\"by appointment\""
    },
    {
      "key": "opening_hours",
      "description": "Layer 'Animal shelters' shows opening_hours~^(\"by appointment\"|by appointment)$ with a fixed text, namely 'Only by appointment' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
    },
    {
      "key": "opening_hours",
      "description": "Layer 'Animal shelters' shows opening_hours=closed with a fixed text, namely 'Marked as closed for an unspecified time' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
      "value": "closed"
    },
    {
      "key": "animal_shelter",
      "description": "Layer 'Animal shelters' shows and asks freeform values for key 'animal_shelter' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
--- a/Docs/TagInfo/mapcomplete_playgrounds.json
+++ b/Docs/TagInfo/mapcomplete_playgrounds.json
@ -89,6 +89,11 @@
      "description": "Layer 'Playgrounds' shows surface=rubber with a fixed text, namely 'The surface is made from rubber, such as rubber tiles, rubber mulch or a big rubber area' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "rubber"
    },
    {
      "key": "surface",
      "description": "Layer 'Playgrounds' shows surface=fine_gravel with a fixed text, namely 'The surface is <b>fine gravel</b> (less then 2 cm per stone)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "fine_gravel"
    },
    {
      "key": "lit",
      "description": "Layer 'Playgrounds' shows lit=yes with a fixed text, namely 'This playground is lit at night' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
--- a/Docs/TagInfo/mapcomplete_postboxes.json
+++ b/Docs/TagInfo/mapcomplete_postboxes.json
@ -352,8 +352,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -1181,17 +1181,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1330,6 +1330,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Postbox and Post Office Map') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map')",
@ -1453,6 +1649,10 @@
      "key": "diet:lactose_free",
      "description": "Layer 'Shop' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Postbox and Post Office Map') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Postbox and Post Office Map')"
    }
  ]
 }
--- a/Docs/TagInfo/mapcomplete_shops.json
+++ b/Docs/TagInfo/mapcomplete_shops.json
@ -54,8 +54,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -883,17 +883,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1032,6 +1032,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Shops') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Shops') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Shops') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Shops') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Shops') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Shops') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Shops') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Shops') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Shops') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Shops') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
@ -1156,6 +1352,10 @@
      "description": "Layer 'Shop' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Shops')"
    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Shops has a layer Pharmacies showing features with this tag",
--- a/Docs/TagInfo/mapcomplete_ski.json
+++ b/Docs/TagInfo/mapcomplete_ski.json
@ -1123,6 +1123,42 @@
      "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
      "value": "thai"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "mapillary",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikidata",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "wikipedia",
      "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
    },
    {
      "key": "image",
      "description": "The layer 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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 'Restaurants and fast food 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": "website:menu",
      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'website:menu' (in the mapcomplete.org theme 'Ski pistes and aerialways')"
    },
    {
      "key": "reservation",
      "description": "Layer 'Restaurants and fast food' shows reservation=required with a fixed text, namely 'A reservation is required at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if takeaway!=only)",
--- a/Docs/TagInfo/mapcomplete_sports.json
+++ b/Docs/TagInfo/mapcomplete_sports.json
@ -613,8 +613,8 @@
    },
    {
      "key": "shop",
-      "description": "Layer 'Shop' shows shop=vacant with a fixed text, namely 'Vacant Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if craft=)",
+      "description": "Layer 'Shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if craft=)",
-      "value": "vacant"
+      "value": "bicycle_rental"
    },
    {
      "key": "shop",
@ -1442,17 +1442,17 @@
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=only with a fixed text, namely 'This shop sells second-hand items <b>only</b>' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "only"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=yes with a fixed text, namely 'This shop sells second-hand items along with new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "yes"
    },
    {
      "key": "second_hand",
-      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=clothes | shop=car | shop=books | shop=charity | shop=car_repair | shop=furniture | shop=bicycle | shop=bicycle | shop=mobile_phone | shop=computer | shop=toys)",
+      "description": "Layer 'Shop' shows second_hand=no with a fixed text, namely 'This shop only sells brand-new items' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=clothes | shop=books | shop=charity | shop=furniture | shop=mobile_phone | shop=computer | shop=toys)",
      "value": "no"
    },
    {
@ -1591,6 +1591,202 @@
      "description": "Layer 'Shop' shows craft= & service:key_cutting=no with a fixed text, namely 'This shops does not offer key cutting as a service' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=shoe_repair | service:key_cutting~.+ | craft=key_cutting | shop=diy | shop=doityourself | shop=home_improvement | shop=hardware | shop=locksmith | shop=repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=yes with a fixed text, namely 'This shop sells new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:retail",
      "description": "Layer 'Shop' shows service:bicycle:retail=no with a fixed text, namely 'This shop doesn't sell new bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:retail~.+ | shop=outdoor | shop=sport | shop=diy | shop=doityourself)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=yes with a fixed text, namely 'This shop sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=no with a fixed text, namely 'This shop doesn't sell second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "no"
    },
    {
      "key": "service:bicycle:second_hand",
      "description": "Layer 'Shop' shows service:bicycle:second_hand=only with a fixed text, namely 'This shop only sells second-hand bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:second_hand~.+ | shop=bicycle | shop=charity | shop=second_hand | shop=bicycle_repair)",
      "value": "only"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=yes with a fixed text, namely 'This shop repairs bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=no with a fixed text, namely 'This shop doesn't repair bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "no"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=only_sold with a fixed text, namely 'This shop only repairs bikes bought here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:repair",
      "description": "Layer 'Shop' shows service:bicycle:repair=brand with a fixed text, namely 'This shop only repairs bikes of a certain brand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:repair~.+ | shop=sport | shop=outdoor | shop=bicycle | service:bicycle:retail=yes | service:bicycle:second_hand=yes | service:bicycle:second_hand=only)",
      "value": "brand"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=yes with a fixed text, namely 'This shop rents out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:rental",
      "description": "Layer 'Shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
      "value": "no"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "city_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "ebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bmx"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "mtb"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "kid_bike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "tandem"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "racebike"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "bike_helmet"
    },
    {
      "key": "rental",
      "description": "Layer 'Shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
      "value": "cargo_bike"
    },
    {
      "key": "capacity:city_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Sports') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:ebike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Sports') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:kid_bike",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Sports') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bmx",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Sports') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:mtb",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Sports') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:bicycle_pannier",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Sports') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "capacity:tandem_bicycle",
      "description": "Layer 'Shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Sports') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=no with a fixed text, namely 'This shop doesn't offer a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:pump",
      "description": "Layer 'Shop' shows service:bicycle:pump=separate with a fixed text, namely 'There is bicycle pump, it is shown as a separate point' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
      "value": "separate"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=yes with a fixed text, namely 'This shop offers tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=no with a fixed text, namely 'This shop doesn't offer tools for DIY bicycle repair' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:diy",
      "description": "Layer 'Shop' shows service:bicycle:diy=only_sold with a fixed text, namely 'Tools for DIY bicycle repair are only available if you bought/hire the bike in the shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:diy~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:repair~^(yes|only)$)",
      "value": "only_sold"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=yes with a fixed text, namely 'This shop cleans bicycles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=diy with a fixed text, namely 'This shop has an installation where one can clean bicycles themselves' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "diy"
    },
    {
      "key": "service:bicycle:cleaning",
      "description": "Layer 'Shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Sports') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "no"
    },
    {
      "key": "service:bicycle:cleaning:fee",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Sports') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": "yes"
    },
    {
      "key": "service:bicycle:cleaning:charge",
      "description": "Layer 'Shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Sports') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
      "value": ""
    },
    {
      "key": "internet_access",
      "description": "Layer 'Shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
@ -1714,6 +1910,10 @@
      "key": "diet:lactose_free",
      "description": "Layer 'Shop' shows diet:lactose_free=no with a fixed text, namely 'No lactose free offering' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports') (This is only shown if shop=supermarket | shop=convenience | shop=farm | shop=greengrocer | shop=health_food | shop=deli | shop=bakery | shop=beverages | shop=beverages | shop=pastry | shop=chocolate | shop=frozen_food | shop=ice_cream)",
      "value": "no"
    },
    {
      "key": "description",
      "description": "Layer 'Shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Sports')"
    }
  ]
 }
--- a/Docs/Themes/artwork.md
+++ b/Docs/Themes/artwork.md
@ -10,6 +10,8 @@ This theme contains the following layers:
 - [artwork](../Layers/artwork.md)
 - [memorial](../Layers/memorial.md)
 - [bench](../Layers/bench.md)
 - [walls_and_buildings](../Layers/walls_and_buildings.md)
--- a/Docs/Themes/bicycle_parkings.md
+++ b/Docs/Themes/bicycle_parkings.md
@ -23,6 +23,7 @@ Available languages:
 - da
 - es
 - zh_Hans
 - it
 # Layers defined in this theme configuration file
--- a/Docs/Themes/bicycle_rental.md
+++ b/Docs/Themes/bicycle_rental.md
@ -30,6 +30,7 @@ Available languages:
 - eu
 - pl
 - zh_Hans
 - it
 # Layers defined in this theme configuration file
--- a/Docs/Themes/circular_economy.md
+++ b/Docs/Themes/circular_economy.md
--- a/Docs/Themes/climbing.md
+++ b/Docs/Themes/climbing.md
--- a/Docs/Themes/clock.md
+++ b/Docs/Themes/clock.md
@ -26,6 +26,7 @@ Available languages:
 - eu
 - pl
 - da
 - it
 # Layers defined in this theme configuration file
--- a/Docs/Themes/cyclofix.md
+++ b/Docs/Themes/cyclofix.md
@ -15,6 +15,7 @@ This theme contains the following layers:
 - [drinking_water](../Layers/drinking_water.md)
 - [bike_themed_object](../Layers/bike_themed_object.md)
 - [bike_cleaning](../Layers/bike_cleaning.md)
 - [shops](../Layers/shops.md)
 - [bicycle_rental_non_docking (defined in this theme)](#bicycle_rental_non_docking)
 - [bicycle_rental](../Layers/bicycle_rental.md)
 - [bicycle_library](../Layers/bicycle_library.md)
--- a/Docs/Themes/education.md
+++ b/Docs/Themes/education.md
@ -30,6 +30,7 @@ Available languages:
 - eu
 - pl
 - zh_Hant
 - it
 # Layers defined in this theme configuration file
--- a/Docs/Themes/fireplace.md
+++ b/Docs/Themes/fireplace.md
@ -18,6 +18,7 @@ Available languages:
 - en
 - de
 - es
 # Layers defined in this theme configuration file
--- a/Docs/Themes/fritures.md
+++ b/Docs/Themes/fritures.md
@ -49,6 +49,9 @@ Available languages:
    + [single_level](#single_level)
    + [wheelchair-access](#wheelchair-access)
    + [Cuisine](#cuisine)
    + [show-menu-image](#show-menu-image)
    + [add-menu-image](#add-menu-image)
    + [menu-website](#menu-website)
    + [Reservation](#reservation)
    + [Takeaway](#takeaway)
    + [delivery](#delivery)
@ -120,6 +123,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
@ -315,6 +319,30 @@ The question is `What kind of food is served here?`
 ### show-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_carousel(image:menu)}*
 ### add-menu-image
 _This tagrendering has no question and is thus read-only_
 *{image_upload(image:menu,Add an image from the menu)}*
 ### menu-website
 The question is `On what webpage is the menu published?`
 *{link(Consult the menu,&LBRACEwebsite:menu&RBRACE,,,)}* is shown if `website:menu` is set
 ### Reservation
 The question is `Is a reservation required for this place?`
@ -365,8 +393,8 @@ The question is `Does this restaurant have a vegetarian option?`
 -  *No vegetarian options are available* is shown if 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>
 -  *Some vegetarian options are available* is shown if 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%3Dlimited' target='_blank'>limited</a>
- -  *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *Vegetarian options are available* is shown if 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%3Dyes' target='_blank'>yes</a>
- -  *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/food/Vegetarian-mark.svg' style='width: 3rem; height: 3rem'> *All dishes are vegetarian* is shown if 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%3Donly' target='_blank'>only</a>
 -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if 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%3Don_demand' target='_blank'>on_demand</a>
@ -586,10 +614,10 @@ The question is `Does this place offer internet access?`
- -  *This place offers wireless internet access* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/wifi' style='width: 3rem; height: 3rem'> *This place offers wireless internet access* is shown if 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* is shown if 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* is shown if 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* is shown if 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>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if 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* is shown if 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>
--- a/Docs/Themes/glutenfree.md
+++ b/Docs/Themes/glutenfree.md
--- a/Docs/Themes/healthcare.md
+++ b/Docs/Themes/healthcare.md
--- a/Show more
+++ b/Show more
`@ -12,7 +12,7 @@ This layer shows dentist offices`



	`- This layer is shown at zoomlevel 13 and higher`	`- This layer is shown at zoomlevel 8 and higher`