diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md
index 5e79db2e1..85e91176e 100644
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@@ -90,6 +90,7 @@
   - ambulancestation
   - artwork
   - atm
+  - atm
   - barrier
   - bench
   - bench_at_pt
@@ -127,6 +128,7 @@
   - food
   - ghost_bike
   - governments
+  - guidepost
   - hackerspace
   - hotel
   - hydrant
@@ -217,6 +219,7 @@
 
 
 
+  - atm
   - atm
   - bicycle_library
   - bicycle_rental
diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index 8cf91d802..15e4c804a 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -132,7 +132,7 @@ MapComplete has a few data layers available in the theme which have special prop
 
 
 
-<img src='https://mapcomplete.org/circle:red' height="100px"> 
+
 
 Highlights the currently selected element. Override this layer to have different colors
 
@@ -175,7 +175,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-<img src='https://mapcomplete.org/crosshair:var(--catch-detail-color)' height="100px"> 
+
 
 Meta layer showing the current location of the user. Add this to your theme and override the icon to change the appearance of the current location. The object will always have `id=gps` and will have _all_ the properties included in the [`Coordinates`-object](https://developer.mozilla.org/en-US/docs/Web/API/GeolocationCoordinates) (except latitude and longitude) returned by the browser, such as `speed`, `altitude`, `heading`, ....
 
@@ -218,7 +218,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-<img src='https://mapcomplete.org/square:red' height="100px"> 
+
 
 Meta layer which contains the previous locations of the user as single points. This is mainly for technical reasons, e.g. to keep match the distance to the modified object
 
@@ -263,7 +263,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/svg/home.svg' height="100px"> 
+
 
 Meta layer showing the home location of the user. The home location can be set in the [profile settings](https://www.openstreetmap.org/profile/edit) of OpenStreetMap.
 
@@ -511,7 +511,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-<img src='https://mapcomplete.org/<div class='relative'> <img src='./assets/svg/add_pin.svg' class='absolute' style='height: 50px'> <div class='absolute top-0 left-0 rounded-full overflow-hidden noselect' style='width: 40px; height: 40px'><div class='flex slide min-w-min' style='animation: slide linear {number_of_presets}s infinite; width: calc( (1 + {number_of_presets}) * 40px ); height: 40px'>{renderings}{first_preset}</div></div></div>' height="100px"> 
+
 
 This layer defines how to render the 'last click'-location. By default, it will show a marker with the possibility to add a new point (if there are some presets) and/or to add a new note (if the 'note' layer attribute is set). If none are possible, this layer won't show up
 
@@ -640,7 +640,7 @@ action.0 | only_if_action_is_possible | has_note_layer=yes\|has_presets=yes
 
 
 
-<img src='https://mapcomplete.org/addSmall:#000' height="100px"> 
+
 
 If the import-button moves OSM points, the imported way points or conflates, a preview is shown. This layer defines how this preview is rendered. This layer cannot be included in a theme.
 
@@ -681,7 +681,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/svg/scissors.svg' height="100px"> 
+
 
 Layer rendering the little scissors for the minimap in the 'splitRoadWizard'
 
@@ -722,7 +722,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-<img src='https://mapcomplete.org/bug' height="100px"> 
+
 
 Layer rendering the way to split in the 'splitRoadWizard'. This one is used instead of the variable rendering by the themes themselves, as they might not always be very visible
 
@@ -865,59 +865,12 @@ This tagrendering has no question and is thus read-only
 
 
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
- matchpoint 
-============
-
-
-
-<img src='https://mapcomplete.org/./assets/svg/crosshair-empty.svg' height="100px"> 
-
-The default rendering for a locationInput which snaps onto another object
-
-
-
-
-
-
-  - This layer is shown at zoomlevel **0** and higher
-  - This layer can **not** be included in a theme. It is solely used by [special renderings](SpecialRenderings.md) showing a minimap with custom data.
-
-
-
-
- Basic tags for this layer 
----------------------------
-
-
-
-Elements must have the all of following tags to be shown on this layer:
-
-
-
-
-
-
-
-
- Supported attributes 
-----------------------
-
-
-
-
-
->>>>>>> develop
-=======
->>>>>>> develop
  import_candidate 
 ==================
 
 
 
-<img src='https://mapcomplete.org/square:red;' height="100px"> 
+
 
 Layer used as template in the importHelper
 
@@ -1498,6 +1451,7 @@ The following layers are included in MapComplete:
   - [gps_location](./Layers/gps_location.md)
   - [gps_location_history](./Layers/gps_location_history.md)
   - [gps_track](./Layers/gps_track.md)
+  - [guidepost](./Layers/guidepost.md)
   - [hackerspace](./Layers/hackerspace.md)
   - [home_location](./Layers/home_location.md)
   - [hospital](./Layers/hospital.md)
diff --git a/Docs/Layers/address.md b/Docs/Layers/address.md
index 4fcf609d2..e3f6ceeb7 100644
--- a/Docs/Layers/address.md
+++ b/Docs/Layers/address.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/address/housenumber_blank.svg' height="100px"> 
+
 
 Addresses
 
diff --git a/Docs/Layers/advertising.md b/Docs/Layers/advertising.md
index 65cba1831..b7f9e844f 100644
--- a/Docs/Layers/advertising.md
+++ b/Docs/Layers/advertising.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/advertising/sign.svg' height="100px"> 
+
 
 We will complete data from advertising features with reference, operator and lit
 
diff --git a/Docs/Layers/all_vending_machine.md b/Docs/Layers/all_vending_machine.md
index a09962892..66ae52dd7 100644
--- a/Docs/Layers/all_vending_machine.md
+++ b/Docs/Layers/all_vending_machine.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/vending_machine/vending_machine.svg' height="100px"> 
+
 
 Layer showing vending machines
 
diff --git a/Docs/Layers/ambulancestation.md b/Docs/Layers/ambulancestation.md
index 493eb314a..1a2a40e71 100644
--- a/Docs/Layers/ambulancestation.md
+++ b/Docs/Layers/ambulancestation.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/hailhydrant/Twemoji_1f691.svg' height="100px"> 
+
 
 An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.
 
diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md
index 92156d4e4..a3305b91c 100644
--- a/Docs/Layers/artwork.md
+++ b/Docs/Layers/artwork.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/themes/artwork/artwork.svg' height="100px"> 
+
 
 An open map of statues, busts, graffitis and other artwork all over the world
 
@@ -55,6 +55,14 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/wikidata#values) [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/subject:wikidata#values) [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [bench](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbench) [](https://wiki.openstreetmap.org/wiki/Tag:amenity%3D)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/backrest#values) [backrest](https://wiki.openstreetmap.org/wiki/Key:backrest) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:backrest%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/seats#values) [seats](https://wiki.openstreetmap.org/wiki/Key:seats) | [nat](../SpecialInputElements.md#nat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/material#values) [material](https://wiki.openstreetmap.org/wiki/Key:material) | [string](../SpecialInputElements.md#string) | [wood](https://wiki.openstreetmap.org/wiki/Tag:material%3Dwood) [metal](https://wiki.openstreetmap.org/wiki/Tag:material%3Dmetal) [stone](https://wiki.openstreetmap.org/wiki/Tag:material%3Dstone) [concrete](https://wiki.openstreetmap.org/wiki/Tag:material%3Dconcrete) [plastic](https://wiki.openstreetmap.org/wiki/Tag:material%3Dplastic) [steel](https://wiki.openstreetmap.org/wiki/Tag:material%3Dsteel)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/direction#values) [direction](https://wiki.openstreetmap.org/wiki/Key:direction) | [direction](../SpecialInputElements.md#direction) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/colour#values) [colour](https://wiki.openstreetmap.org/wiki/Key:colour) | [color](../SpecialInputElements.md#color) | [brown](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dbrown) [green](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgreen) [gray](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dgray) [white](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dwhite) [red](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dred) [black](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblack) [blue](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dblue) [yellow](https://wiki.openstreetmap.org/wiki/Tag:colour%3Dyellow)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/inscription#values) [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/historic#values) [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [memorial](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D)
 
 
 
@@ -231,6 +239,194 @@ The question is  *Does this artwork serve as a bench?*
 
 
 
+### bench-backrest 
+
+
+
+The question is  *Does this bench have a backrest?*
+
+
+
+
+
+  - *This bench is two-sided and shares the backrest*  corresponds with  `backrest=yes&two_sided=yes`
+  - *Does have a backrest*  corresponds with  `backrest=yes`
+  - *Does <b>not</b> have a backrest*  corresponds with  `backrest=no`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-seats 
+
+
+
+The question is  *How many seats does this bench have?*
+
+This rendering asks information about the property  [seats](https://wiki.openstreetmap.org/wiki/Key:seats) 
+
+This is rendered with  `{seats} seats`
+
+
+
+
+
+  - *This bench does not have separated seats*  corresponds with  `seats:separated=no`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-material 
+
+
+
+The question is  *What is the bench (seating) made from?*
+
+This rendering asks information about the property  [material](https://wiki.openstreetmap.org/wiki/Key:material) 
+
+This is rendered with  `Material: {material}`
+
+
+
+
+
+  - *The seating is made from wood*  corresponds with  `material=wood`
+  - *The seating is made from metal*  corresponds with  `material=metal`
+  - *The seating is made from stone*  corresponds with  `material=stone`
+  - *The seating is made from concrete*  corresponds with  `material=concrete`
+  - *The seating is made from plastic*  corresponds with  `material=plastic`
+  - *The seating is made from steel*  corresponds with  `material=steel`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-direction 
+
+
+
+The question is  *In which direction are you looking when sitting on the bench?*
+
+This rendering asks information about the property  [direction](https://wiki.openstreetmap.org/wiki/Key:direction) 
+
+This is rendered with  `When sitting on the bench, one looks towards {direction}°.`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-colour 
+
+
+
+The question is  *Which colour does this bench have?*
+
+This rendering asks information about the property  [colour](https://wiki.openstreetmap.org/wiki/Key:colour) 
+
+This is rendered with  `Colour: {colour}`
+
+
+
+
+
+  - *Colour: brown*  corresponds with  `colour=brown`
+  - *Colour: green*  corresponds with  `colour=green`
+  - *Colour: gray*  corresponds with  `colour=gray`
+  - *Colour: white*  corresponds with  `colour=white`
+  - *Colour: red*  corresponds with  `colour=red`
+  - *Colour: black*  corresponds with  `colour=black`
+  - *Colour: blue*  corresponds with  `colour=blue`
+  - *Colour: yellow*  corresponds with  `colour=yellow`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-survey:date 
+
+
+
+The question is  *When was this bench last surveyed?*
+
+This rendering asks information about the property  [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) 
+
+This is rendered with  `This bench was last surveyed on {survey:date}`
+
+
+
+
+
+  - *Surveyed today!*  corresponds with  `survey:date=`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-inscription 
+
+
+
+The question is  *Does this bench have an inscription?*
+
+This rendering asks information about the property  [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) 
+
+This is rendered with  `This bench does have the following inscription:<br/><p><i>{inscription}</i></p>`
+
+
+
+
+
+  - *This bench does not have an inscription*  corresponds with  `not:inscription=yes`
+  - *This bench does <span class='subtle'>(probably)</span> not have an inscription*  corresponds with  ``
+  - This option cannot be chosen as answer
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
+### bench-memorial 
+
+
+
+The question is  *Does this bench act as memorial for someone or something?*
+
+
+
+
+
+  - *This bench is a memorial for someone or something*  corresponds with  `historic=memorial`
+  - *This bench is a <b>not</b> a memorial for someone or something*  corresponds with  `not:historic=memorial`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=bench`
+
+This tagrendering has labels  `bench-questions`
+
+
+
 ### leftover-questions 
 
 
diff --git a/Docs/Layers/atm.md b/Docs/Layers/atm.md
index 31a14538e..05be8bb76 100644
--- a/Docs/Layers/atm.md
+++ b/Docs/Layers/atm.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/atm/atm.svg' height="100px"> 
+
 
 ATMs to withdraw money
 
diff --git a/Docs/Layers/bank.md b/Docs/Layers/bank.md
index 50ac7d42d..7c7aace31 100644
--- a/Docs/Layers/bank.md
+++ b/Docs/Layers/bank.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/bank/bank.svg' height="100px"> 
+
 
 A financial institution to deposit money
 
diff --git a/Docs/Layers/banks_with_atm.md b/Docs/Layers/banks_with_atm.md
index a426960d3..2e84bbf59 100644
--- a/Docs/Layers/banks_with_atm.md
+++ b/Docs/Layers/banks_with_atm.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/bank/bank.svg' height="100px"> 
+
 
 A financial institution to deposit money
 
diff --git a/Docs/Layers/barrier.md b/Docs/Layers/barrier.md
index 8fc340762..53622361d 100644
--- a/Docs/Layers/barrier.md
+++ b/Docs/Layers/barrier.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/barrier/barrier.svg' height="100px"> 
+
 
 Obstacles while cycling, such as bollards and cycle barriers
 
diff --git a/Docs/Layers/bench.md b/Docs/Layers/bench.md
index e1e305df0..1db6bcca5 100644
--- a/Docs/Layers/bench.md
+++ b/Docs/Layers/bench.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:#99bd54;./assets/layers/bench/bench.svg' height="100px"> 
+
 
 A bench is a wooden, metal, stone, … surface where a human can sit. This layers visualises them and asks a few questions about them.
 
@@ -57,6 +57,11 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/survey:date#values) [survey:date](https://wiki.openstreetmap.org/wiki/Key:survey:date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:survey:date%3D)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/inscription#values) [inscription](https://wiki.openstreetmap.org/wiki/Key:inscription) | [text](../SpecialInputElements.md#text) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/historic#values) [historic](https://wiki.openstreetmap.org/wiki/Key:historic) | Multiple choice | [memorial](https://wiki.openstreetmap.org/wiki/Tag:historic%3Dmemorial) [](https://wiki.openstreetmap.org/wiki/Tag:historic%3D)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artwork_type#values) [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type) | [string](../SpecialInputElements.md#string) | [architecture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Darchitecture) [mural](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dmural) [painting](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dpainting) [sculpture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dsculpture) [statue](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstatue) [bust](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dbust) [stone](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstone) [installation](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dinstallation) [graffiti](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dgraffiti) [relief](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Drelief) [azulejo](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dazulejo) [tilework](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dtilework) [woodcarving](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dwoodcarving)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artist:wikidata#values) [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artist_name#values) [artist_name](https://wiki.openstreetmap.org/wiki/Key:artist_name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/subject:wikidata#values) [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
 
 
 
@@ -284,6 +289,113 @@ This tagrendering has labels  `bench-questions`
 
 
 
+### artwork-artwork_type 
+
+
+
+The question is  *What is the type of this artwork?*
+
+This rendering asks information about the property  [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type) 
+
+This is rendered with  `This is a {artwork_type}`
+
+
+
+
+
+  - *Architecture*  corresponds with  `artwork_type=architecture`
+  - *Mural*  corresponds with  `artwork_type=mural`
+  - *Painting*  corresponds with  `artwork_type=painting`
+  - *Sculpture*  corresponds with  `artwork_type=sculpture`
+  - *Statue*  corresponds with  `artwork_type=statue`
+  - *Bust*  corresponds with  `artwork_type=bust`
+  - *Stone*  corresponds with  `artwork_type=stone`
+  - *Installation*  corresponds with  `artwork_type=installation`
+  - *Graffiti*  corresponds with  `artwork_type=graffiti`
+  - *Relief*  corresponds with  `artwork_type=relief`
+  - *Azulejo (Spanish decorative tilework)*  corresponds with  `artwork_type=azulejo`
+  - *Tilework*  corresponds with  `artwork_type=tilework`
+  - *Woodcarving*  corresponds with  `artwork_type=woodcarving`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
+
+This tagrendering has labels  `artwork-question`
+
+
+
+### artwork-artist-wikidata 
+
+
+
+The question is  *Who made this artwork?*
+
+This rendering asks information about the property  [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata) 
+
+This is rendered with  `This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
+
+This tagrendering has labels  `artwork-question`
+
+
+
+### artwork-artist_name 
+
+
+
+The question is  *Which artist created this?*
+
+This rendering asks information about the property  [artist_name](https://wiki.openstreetmap.org/wiki/Key:artist_name) 
+
+This is rendered with  `Created by {artist_name}`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
+
+This tagrendering has labels  `artwork-question`
+
+
+
+### artwork-website 
+
+
+
+The question is  *Is there a website with more information about this artwork?*
+
+This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
+
+This is rendered with  `{link(More information on this website,&LBRACEwebsite&RBRACE,,)}`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
+
+This tagrendering has labels  `artwork-question`
+
+
+
+### artwork_subject 
+
+
+
+The question is  *What does this artwork depict?*
+
+This rendering asks information about the property  [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) 
+
+This is rendered with  `This artwork depicts {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `tourism=artwork`
+
+This tagrendering has labels  `artwork-question`
+
+
+
 ### leftover-questions 
 
 
diff --git a/Docs/Layers/bench_at_pt.md b/Docs/Layers/bench_at_pt.md
index b2ad3bb86..96931184c 100644
--- a/Docs/Layers/bench_at_pt.md
+++ b/Docs/Layers/bench_at_pt.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/themes/benches/bench_public_transport.svg' height="100px"> 
+
 
 A layer showing all public-transport-stops which do have a bench
 
diff --git a/Docs/Layers/bicycle_library.md b/Docs/Layers/bicycle_library.md
index d926e49a5..112fcfd39 100644
--- a/Docs/Layers/bicycle_library.md
+++ b/Docs/Layers/bicycle_library.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg' height="100px"> 
+
 
 A facility where bicycles can be lent for longer period of times
 
diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md
index 46e5d474c..99a5562d1 100644
--- a/Docs/Layers/bicycle_rental.md
+++ b/Docs/Layers/bicycle_rental.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/bicycle_rental/logo.svg' height="100px"> 
+
 
 Bicycle rental stations
 
diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md
index b39c96b4c..95592dd41 100644
--- a/Docs/Layers/bicycle_rental_non_docking.md
+++ b/Docs/Layers/bicycle_rental_non_docking.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/bicycle_rental/logo.svg' height="100px"> 
+
 
 Bicycle rental stations
 
diff --git a/Docs/Layers/bicycle_tube_vending_machine.md b/Docs/Layers/bicycle_tube_vending_machine.md
index 2859ae344..3075f4985 100644
--- a/Docs/Layers/bicycle_tube_vending_machine.md
+++ b/Docs/Layers/bicycle_tube_vending_machine.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg' height="100px"> 
+
 
 A layer showing vending machines for bicycle tubes (either purpose-built bicycle tube vending machines or classical vending machines with bicycle tubes and optionally additional bicycle related objects such as lights, gloves, locks, …)
 
diff --git a/Docs/Layers/bike_cafe.md b/Docs/Layers/bike_cafe.md
index 70c265511..d49dbb77d 100644
--- a/Docs/Layers/bike_cafe.md
+++ b/Docs/Layers/bike_cafe.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#684c2b;./assets/layers/bike_cafe/bike_cafe.svg' height="100px"> 
+
 
 A bike café is a café geared towards cyclists, for example with services such as a pump, with lots of bicycle-related decoration, …
 
diff --git a/Docs/Layers/bike_cleaning.md b/Docs/Layers/bike_cleaning.md
index 3f0fe2e66..b560466c0 100644
--- a/Docs/Layers/bike_cleaning.md
+++ b/Docs/Layers/bike_cleaning.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/bike_cleaning/bike_cleaning.svg' height="100px"> 
+
 
 A layer showing facilities where one can clean their bike
 
diff --git a/Docs/Layers/bike_parking.md b/Docs/Layers/bike_parking.md
index a2c6c332d..f8e2e8f0e 100644
--- a/Docs/Layers/bike_parking.md
+++ b/Docs/Layers/bike_parking.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#5473de;./assets/layers/bike_parking/parking.svg' height="100px"> 
+
 
 A layer showing where you can park your bike
 
diff --git a/Docs/Layers/bike_repair_station.md b/Docs/Layers/bike_repair_station.md
index 1c1c2713b..afd544ece 100644
--- a/Docs/Layers/bike_repair_station.md
+++ b/Docs/Layers/bike_repair_station.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#88d32c;./assets/layers/bike_repair_station/repair_station.svg' height="100px"> 
+
 
 A layer showing bicycle pumps and bicycle repair tool stands
 
diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md
index afb34fbce..bbf7b79bb 100644
--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#f04c4c;./assets/layers/bike_shop/repair_shop.svg' height="100px"> 
+
 
 A shop specifically selling bicycles or related items
 
@@ -57,10 +57,19 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:retail#values) [service:bicycle:retail](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:retail) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:retail%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:retail%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:repair#values) [service:bicycle:repair](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Donly_sold) [brand](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dbrand)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:rental#values) [service:bicycle:rental](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/rental#values) [rental](https://wiki.openstreetmap.org/wiki/Key:rental) | [string](../SpecialInputElements.md#string) | [city_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcity_bike) [ebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Debike) [bmx](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbmx) [mtb](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dmtb) [kid_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dkid_bike) [tandem](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dtandem) [racebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dracebike) [bike_helmet](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbike_helmet)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity:city_bike#values) [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity:ebike#values) [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity:kid_bike#values) [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity:bmx#values) [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity:mtb#values) [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity:bicycle_pannier#values) [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity:tandem_bicycle#values) [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) | [pnat](../SpecialInputElements.md#pnat) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:second_hand#values) [service:bicycle:second_hand](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:second_hand) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Donly)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:pump#values) [service:bicycle:pump](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dno) [separate](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dseparate)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:diy#values) [service:bicycle:diy](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:diy) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Donly_sold)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:cleaning#values) [service:bicycle:cleaning](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dyes) [diy](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Ddiy) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:bicycle:cleaning:charge#values) [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/description#values) [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) | 
 
 
@@ -272,6 +281,162 @@ The question is  *Does this shop rent out bikes?*
 
 
 
+### bicycle-types 
+
+
+
+The question is  *What kind of bicycles and accessories are rented here?*
+
+This rendering asks information about the property  [rental](https://wiki.openstreetmap.org/wiki/Key:rental) 
+
+This is rendered with  `{rental} is rented here`
+
+
+
+
+
+  - *Normal city bikes can be rented here*  corresponds with  `rental=city_bike`
+  - *Electrical bikes can be rented here*  corresponds with  `rental=ebike`
+  - *BMX bikes can be rented here*  corresponds with  `rental=bmx`
+  - *Mountainbikes can be rented here*  corresponds with  `rental=mtb`
+  - *Bikes for children can be rented here*  corresponds with  `rental=kid_bike`
+  - *Tandem bicycles can be rented here*  corresponds with  `rental=tandem`
+  - *Race bicycles can be rented here*  corresponds with  `rental=racebike`
+  - *Bike helmets can be rented here*  corresponds with  `rental=bike_helmet`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
+### rental-capacity-city_bike 
+
+
+
+The question is  *How many city bikes can be rented here?*
+
+This rendering asks information about the property  [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) 
+
+This is rendered with  `{capacity:city_bike} city bikes can be rented here`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*city_bike.*)$&service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
+### rental-capacity-ebike 
+
+
+
+The question is  *How many electrical bikes can be rented here?*
+
+This rendering asks information about the property  [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) 
+
+This is rendered with  `{capacity:ebike} electrical bikes can be rented here`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*ebike.*)$&service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
+### rental-capacity-kid_bike 
+
+
+
+The question is  *How many bikes for children can be rented here?*
+
+This rendering asks information about the property  [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) 
+
+This is rendered with  `{capacity:kid_bike} bikes for children can be rented here`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*kid_bike.*)$&service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
+### rental-capacity-bmx 
+
+
+
+The question is  *How many BMX bikes can be rented here?*
+
+This rendering asks information about the property  [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) 
+
+This is rendered with  `{capacity:bmx} BMX bikes can be rented here`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bmx.*)$&service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
+### rental-capacity-mtb 
+
+
+
+The question is  *How many mountainbikes can be rented here?*
+
+This rendering asks information about the property  [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) 
+
+This is rendered with  `{capacity:mtb} mountainbikes can be rented here`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*mtb.*)$&service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
+### rental-capacity-bicycle_pannier 
+
+
+
+The question is  *How many bicycle panniers can be rented here?*
+
+This rendering asks information about the property  [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) 
+
+This is rendered with  `{capacity:bicycle_pannier} bicycle panniers can be rented here`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
+### rental-capacity-tandem_bicycle 
+
+
+
+The question is  *How many tandem can be rented here?*
+
+This rendering asks information about the property  [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) 
+
+This is rendered with  `{capacity:tandem_bicycle} tandem can be rented here`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes`
+
+This tagrendering has labels  `bicycle_rental`
+
+
+
 ### bike_repair_second-hand-bikes 
 
 
@@ -340,12 +505,23 @@ The question is  *Are bicycles washed here?*
 
 
 
-### bikecleaningbikecleaningservicebicyclecleaningcharge 
+### bike_cleaning-service:bicycle:cleaning:charge 
 
 
 
-This tagrendering has no question and is thus read-only
+The question is  *How much does it cost to use the cleaning service?*
 
+This rendering asks information about the property  [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) 
+
+This is rendered with  `Using the cleaning service costs {service:bicycle:cleaning:charge}`
+
+
+
+
+
+  - *The cleaning service is free to use*  corresponds with  `service:bicycle:cleaning:fee=no`
+  - *Free to use*  corresponds with  `service:bicycle:cleaning:fee=yes`
+  - This option cannot be chosen as answer
 
 
 
diff --git a/Docs/Layers/bike_themed_object.md b/Docs/Layers/bike_themed_object.md
index c6588d226..682acd27f 100644
--- a/Docs/Layers/bike_themed_object.md
+++ b/Docs/Layers/bike_themed_object.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/bike_themed_object/other_services.svg' height="100px"> 
+
 
 A layer with bike-themed objects but who don't match any other layer
 
diff --git a/Docs/Layers/binocular.md b/Docs/Layers/binocular.md
index dbfa085bf..bc53537c0 100644
--- a/Docs/Layers/binocular.md
+++ b/Docs/Layers/binocular.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/binocular/telescope.svg' height="100px"> 
+
 
 Binoculars
 
diff --git a/Docs/Layers/birdhide.md b/Docs/Layers/birdhide.md
index b1bb1be28..f6c40ec95 100644
--- a/Docs/Layers/birdhide.md
+++ b/Docs/Layers/birdhide.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/birdhide/birdhide.svg' height="100px"> 
+
 
 A birdhide
 
diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md
index e2b400d5a..806fea93d 100644
--- a/Docs/Layers/cafe_pub.md
+++ b/Docs/Layers/cafe_pub.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/cafe_pub/pub.svg' height="100px"> 
+
 
 A layer showing cafés and pubs where one can gather around a drink. The layer asks for some relevant questions
 
diff --git a/Docs/Layers/car_rental.md b/Docs/Layers/car_rental.md
index 178aaeb93..ab2072c23 100644
--- a/Docs/Layers/car_rental.md
+++ b/Docs/Layers/car_rental.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/car_rental/car_rental.svg' height="100px"> 
+
 
 Places where you can rent a car
 
diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md
index 100e02f9b..3260ac3ee 100644
--- a/Docs/Layers/charging_station.md
+++ b/Docs/Layers/charging_station.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#fff;./assets/themes/charging_stations/plug.svg' height="100px"> 
+
 
 A charging station
 
diff --git a/Docs/Layers/charging_station_ebikes.md b/Docs/Layers/charging_station_ebikes.md
index 98e83f35e..66b3d11a5 100644
--- a/Docs/Layers/charging_station_ebikes.md
+++ b/Docs/Layers/charging_station_ebikes.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#fff;./assets/themes/charging_stations/plug.svg' height="100px"> 
+
 
 A charging station
 
diff --git a/Docs/Layers/climbing_area.md b/Docs/Layers/climbing_area.md
index b49349653..b4504f5ac 100644
--- a/Docs/Layers/climbing_area.md
+++ b/Docs/Layers/climbing_area.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/climbing/climbing_no_rope.svg' height="100px"> 
+
 
 An area where climbing is possible, e.g. a crag, site, boulder, … Contains aggregation of routes
 
@@ -51,6 +51,9 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:name%3D)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing#values) [climbing](https://wiki.openstreetmap.org/wiki/Key:climbing) | Multiple choice | [boulder](https://wiki.openstreetmap.org/wiki/Tag:climbing%3Dboulder) [crag](https://wiki.openstreetmap.org/wiki/Tag:climbing%3Dcrag) [area](https://wiki.openstreetmap.org/wiki/Tag:climbing%3Darea)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/rock#values) [rock](https://wiki.openstreetmap.org/wiki/Key:rock) | [string](../SpecialInputElements.md#string) | [limestone](https://wiki.openstreetmap.org/wiki/Tag:rock%3Dlimestone)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/url#values) [url](https://wiki.openstreetmap.org/wiki/Key:url) | [url](../SpecialInputElements.md#url) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:charge%3D)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:boulder#values) [climbing:boulder](https://wiki.openstreetmap.org/wiki/Key:climbing:boulder) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dlimited)
 
 
 
@@ -185,6 +188,61 @@ This tagrendering is only visible in the popup if the following condition is met
 
 
 
+### website 
+
+
+
+The question is  *Is there a (unofficial) website with more informations (e.g. topos)?*
+
+This rendering asks information about the property  [url](https://wiki.openstreetmap.org/wiki/Key:url) 
+
+This is rendered with  `<a href='{url}' target='_blank' rel='noopener'>{url}</a>`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `leisure!~^(sports_centre)$&sport=climbing`
+
+
+
+### fee 
+
+
+
+The question is  *Is a fee required to climb here?*
+
+This rendering asks information about the property  [charge](https://wiki.openstreetmap.org/wiki/Key:charge) 
+
+This is rendered with  `A fee of {charge} should be paid for climbing here`
+
+
+
+
+
+  - *Climbing here is free of charge*  corresponds with  `fee=no`
+  - *Paying a fee is required to climb here*  corresponds with  `fee=yes`
+
+
+
+
+### bouldering 
+
+
+
+The question is  *Is bouldering possible here?*
+
+
+
+
+
+  - *Bouldering is possible here*  corresponds with  `climbing:boulder=yes`
+  - *Bouldering is not possible here*  corresponds with  `climbing:boulder=no`
+  - *Bouldering is possible, although there are only a few problems*  corresponds with  `climbing:boulder=limited`
+  - *There are {climbing:boulder} boulder problems*  corresponds with  `climbing:boulder~.+`
+  - This option cannot be chosen as answer
+
+
+
+
 ### leftover-questions 
 
 
diff --git a/Docs/Layers/climbing_club.md b/Docs/Layers/climbing_club.md
index 00a84787b..989cf099c 100644
--- a/Docs/Layers/climbing_club.md
+++ b/Docs/Layers/climbing_club.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/climbing/club.svg' height="100px"> 
+
 
 A climbing club or organisation
 
diff --git a/Docs/Layers/climbing_gym.md b/Docs/Layers/climbing_gym.md
index 53a359a73..ed961c7b1 100644
--- a/Docs/Layers/climbing_gym.md
+++ b/Docs/Layers/climbing_gym.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/climbing/climbing_gym.svg' height="100px"> 
+
 
 A climbing gym
 
@@ -51,10 +51,18 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:charge%3D)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:climbing_shoes:rental#values) [service:climbing_shoes:rental](https://wiki.openstreetmap.org/wiki/Key:service:climbing_shoes:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:climbing_harness:rental#values) [service:climbing_harness:rental](https://wiki.openstreetmap.org/wiki/Key:service:climbing_harness:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:climbing_rope:rental#values) [service:climbing_rope:rental](https://wiki.openstreetmap.org/wiki/Key:service:climbing_rope:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dyes) [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:boulder#values) [climbing:boulder](https://wiki.openstreetmap.org/wiki/Key:climbing:boulder) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dlimited)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:sport#values) [climbing:sport](https://wiki.openstreetmap.org/wiki/Key:climbing:sport) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:toprope#values) [climbing:toprope](https://wiki.openstreetmap.org/wiki/Key:climbing:toprope) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:toprope%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:toprope%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:length#values) [climbing:length](https://wiki.openstreetmap.org/wiki/Key:climbing:length) | [pfloat](../SpecialInputElements.md#pfloat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:grade:french:min#values) [climbing:grade:french:min](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:min) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:grade:french:max#values) [climbing:grade:french:max](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:max) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:bolts:max#values) [climbing:bolts:max](https://wiki.openstreetmap.org/wiki/Key:climbing:bolts:max) | [pnat](../SpecialInputElements.md#pnat) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/climbing:speed#values) [climbing:speed](https://wiki.openstreetmap.org/wiki/Key:climbing:speed) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:speed%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:speed%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access#values) [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/internet_access:fee#values) [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers)
@@ -174,6 +182,26 @@ This tagrendering has labels  `contact`
 
 
 
+### fee 
+
+
+
+The question is  *Is a fee required to climb here?*
+
+This rendering asks information about the property  [charge](https://wiki.openstreetmap.org/wiki/Key:charge) 
+
+This is rendered with  `A fee of {charge} should be paid for climbing here`
+
+
+
+
+
+  - *Climbing here is free of charge*  corresponds with  `fee=no`
+  - *Paying a fee is required to climb here*  corresponds with  `fee=yes`
+
+
+
+
 ### payment-options 
 
 
@@ -285,51 +313,114 @@ The question is  *Can one rent a climbing rope here?*
 
 
 
-### climbingbouldering 
+### bouldering 
 
 
 
-This tagrendering has no question and is thus read-only
+The question is  *Is bouldering possible here?*
 
 
 
 
 
-### climbingsportclimbing 
+  - *Bouldering is possible here*  corresponds with  `climbing:boulder=yes`
+  - *Bouldering is not possible here*  corresponds with  `climbing:boulder=no`
+  - *Bouldering is possible, although there are only a few problems*  corresponds with  `climbing:boulder=limited`
+  - *There are {climbing:boulder} boulder problems*  corresponds with  `climbing:boulder~.+`
+  - This option cannot be chosen as answer
 
 
 
-This tagrendering has no question and is thus read-only
+
+### sportclimbing 
+
+
+
+The question is  *Is sport climbing possible here on fixed anchors?*
 
 
 
 
 
-### climbingtoprope 
+  - *Sport climbing is possible here*  corresponds with  `climbing:sport=yes`
+  - *Sport climbing is not possible here*  corresponds with  `climbing:sport=no`
+  - *There are {climbing:sport} sport climbing routes*  corresponds with  `climbing:sport~.+`
+  - This option cannot be chosen as answer
 
 
 
-This tagrendering has no question and is thus read-only
+
+### toprope 
+
+
+
+The question is  *Is toprope climbing possible here?*
 
 
 
 
 
-### climbingmindifficulty 
+  - *Toprope climbing is possible here*  corresponds with  `climbing:toprope=yes`
+  - *Toprope climbing is not possible here*  corresponds with  `climbing:toprope=no`
+  - *There are {climbing:toprope} toprope routes*  corresponds with  `climbing:toprope~.+`
+  - This option cannot be chosen as answer
 
 
 
-This tagrendering has no question and is thus read-only
+
+### average_length 
+
+
+
+The question is  *What is the (average) length of the routes in meters?*
+
+This rendering asks information about the property  [climbing:length](https://wiki.openstreetmap.org/wiki/Key:climbing:length) 
+
+This is rendered with  `The routes are <b>{canonical(climbing:length)}</b> long on average`
 
 
 
 
 
-### climbingmaxdifficulty 
+### min_difficulty 
 
 
 
-This tagrendering has no question and is thus read-only
+The question is  *What is the grade of the easiest route here, according to the french classification system?*
+
+This rendering asks information about the property  [climbing:grade:french:min](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:min) 
+
+This is rendered with  `The lowest grade is {climbing:grade:french:min} according to the french/belgian system`
+
+
+
+
+
+### max_difficulty 
+
+
+
+The question is  *What is the highest grade route here, according to the french classification system?*
+
+This rendering asks information about the property  [climbing:grade:french:max](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:max) 
+
+This is rendered with  `The highest grade is {climbing:grade:french:max} according to the french/belgian system`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `climbing!~^(route)$&climbing:sport=yes|sport=climbing`
+
+
+
+### max_bolts 
+
+
+
+The question is  *How many bolts do routes in {title()} have at most?*
+
+This rendering asks information about the property  [climbing:bolts:max](https://wiki.openstreetmap.org/wiki/Key:climbing:bolts:max) 
+
+This is rendered with  `The sport climbing routes here have at most {climbing:bolts:max} bolts.<div class='subtle'>This is without relays and indicates how much quickdraws a climber needs</div>`
 
 
 
diff --git a/Docs/Layers/climbing_opportunity.md b/Docs/Layers/climbing_opportunity.md
index a4f96a1ef..a04562912 100644
--- a/Docs/Layers/climbing_opportunity.md
+++ b/Docs/Layers/climbing_opportunity.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/climbing/climbing_unknown.svg' height="100px"> 
+
 
 Fallback layer with items on which climbing _might_ be possible. It is loaded when zoomed in a lot, to prevent duplicate items to be added
 
diff --git a/Docs/Layers/climbing_route.md b/Docs/Layers/climbing_route.md
index 5fad3788a..d9257f2f7 100644
--- a/Docs/Layers/climbing_route.md
+++ b/Docs/Layers/climbing_route.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/themes/climbing/climbing_route.svg' height="100px"> 
+
 
 A single climbing route and its properties. Some properties are derived from the containing features
 
diff --git a/Docs/Layers/clock.md b/Docs/Layers/clock.md
index f56011b31..a89d2c527 100644
--- a/Docs/Layers/clock.md
+++ b/Docs/Layers/clock.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/clock/clock.svg' height="100px"> 
+
 
 Layer with public clocks
 
diff --git a/Docs/Layers/crab_address.md b/Docs/Layers/crab_address.md
index 9a895e2bf..8f6bc86b4 100644
--- a/Docs/Layers/crab_address.md
+++ b/Docs/Layers/crab_address.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/crab_address/housenumber_blank.svg' height="100px"> 
+
 
 Address data for Flanders by the governement, suited for import into OpenStreetMap. Datadump from 2021-10-26. This layer contains only visualisation logic. Import buttons should be added via an override. Note that HNRLABEL contains the original value, whereas _HNRLABEL contains a slightly cleaned version
 
diff --git a/Docs/Layers/crossings.md b/Docs/Layers/crossings.md
index 1c4f46547..7812e77e6 100644
--- a/Docs/Layers/crossings.md
+++ b/Docs/Layers/crossings.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/crossings/pedestrian_crossing.svg' height="100px"> 
+
 
 Crossings for pedestrians and cyclists
 
diff --git a/Docs/Layers/cultural_places_without_etymology.md b/Docs/Layers/cultural_places_without_etymology.md
index f43d3c83b..7f89a0418 100644
--- a/Docs/Layers/cultural_places_without_etymology.md
+++ b/Docs/Layers/cultural_places_without_etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/cycleways_and_roads.md b/Docs/Layers/cycleways_and_roads.md
index 152328a16..30025407c 100644
--- a/Docs/Layers/cycleways_and_roads.md
+++ b/Docs/Layers/cycleways_and_roads.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/cycle_infra/bicycleway.svg' height="100px"> 
+
 
 All infrastructure that someone can cycle over, accompanied with questions about this infrastructure
 
diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md
index 0d6cdd745..0270d95e6 100644
--- a/Docs/Layers/defibrillator.md
+++ b/Docs/Layers/defibrillator.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:#008754;./assets/layers/defibrillator/defibrillator.svg' height="100px"> 
+
 
 A layer showing defibrillators which can be used in case of emergency. This contains public defibrillators, but also defibrillators which might need staff to fetch the actual device
 
diff --git a/Docs/Layers/dentist.md b/Docs/Layers/dentist.md
index d52b4b840..ee67d58c8 100644
--- a/Docs/Layers/dentist.md
+++ b/Docs/Layers/dentist.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/dentist/dentist.svg' height="100px"> 
+
 
 This layer shows dentist offices
 
diff --git a/Docs/Layers/direction.md b/Docs/Layers/direction.md
index 59aab447e..b4f6bdce7 100644
--- a/Docs/Layers/direction.md
+++ b/Docs/Layers/direction.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/direction_gradient:var(--catch-detail-color)' height="100px"> 
+
 
 This layer visualizes directions
 
diff --git a/Docs/Layers/doctors.md b/Docs/Layers/doctors.md
index 81d4a1973..0494cbcbf 100644
--- a/Docs/Layers/doctors.md
+++ b/Docs/Layers/doctors.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/doctors/doctors.svg' height="100px"> 
+
 
 This layer shows doctor offices
 
diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md
index 43afc0d01..37f750a7b 100644
--- a/Docs/Layers/dogfoodb.md
+++ b/Docs/Layers/dogfoodb.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/food/restaurant.svg' height="100px"> 
+
 
 A layer showing restaurants and fast-food amenities (with a special rendering for friteries)
 
diff --git a/Docs/Layers/dogpark.md b/Docs/Layers/dogpark.md
index 61094640c..27d2faa73 100644
--- a/Docs/Layers/dogpark.md
+++ b/Docs/Layers/dogpark.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/dogpark/dog-park.svg' height="100px"> 
+
 
 A layer showing dogparks, which are areas where dog are allowed to run without a leash
 
diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md
index dbcacf347..ae2f560ca 100644
--- a/Docs/Layers/dogshop.md
+++ b/Docs/Layers/dogshop.md
@@ -47,6 +47,7 @@ attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [vacant](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacant) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
@@ -105,6 +106,188 @@ This is rendered with  `This shop is called <i>{name}</i>`
 
 
 
+### shop_types 
+
+
+
+The question is  *What kind of shop is this?*
+
+This rendering asks information about the property  [shop](https://wiki.openstreetmap.org/wiki/Key:shop) 
+
+This is rendered with  `This is a {shop}`
+
+
+
+
+
+  - *Vacant Shop*  corresponds with  `shop=vacant`
+  - *Farm Supply Shop*  corresponds with  `shop=agrarian`
+  - *Liquor Store*  corresponds with  `shop=alcohol`
+  - *Anime / Manga Shop*  corresponds with  `shop=anime`
+  - *Antique Shop*  corresponds with  `shop=antiques`
+  - *Appliance Store*  corresponds with  `shop=appliance`
+  - *Art Store*  corresponds with  `shop=art`
+  - *Baby Goods Store*  corresponds with  `shop=baby_goods`
+  - *Bag/Luggage Store*  corresponds with  `shop=bag`
+  - *Bakery*  corresponds with  `shop=bakery`
+  - *Bathroom Furnishing Store*  corresponds with  `shop=bathroom_furnishing`
+  - *Beauty Shop*  corresponds with  `shop=beauty`
+  - *Bedding/Mattress Store*  corresponds with  `shop=bed`
+  - *Beverage Store*  corresponds with  `shop=beverages`
+  - *Bicycle Shop*  corresponds with  `shop=bicycle`
+  - *Boat Store*  corresponds with  `shop=boat`
+  - *Bookmaker*  corresponds with  `shop=bookmaker`
+  - *Bookstore*  corresponds with  `shop=books`
+  - *Brewing Supply Store*  corresponds with  `shop=brewing_supplies`
+  - *Butcher*  corresponds with  `shop=butcher`
+  - *Camera Equipment Store*  corresponds with  `shop=camera`
+  - *Candle Shop*  corresponds with  `shop=candles`
+  - *Cannabis Shop*  corresponds with  `shop=cannabis`
+  - *Car Dealership*  corresponds with  `shop=car`
+  - *Car Parts Store*  corresponds with  `shop=car_parts`
+  - *Car Repair Shop*  corresponds with  `shop=car_repair`
+  - *RV Dealership*  corresponds with  `shop=caravan`
+  - *Carpet Store*  corresponds with  `shop=carpet`
+  - *Catalog Shop*  corresponds with  `shop=catalogue`
+  - *Charity Store*  corresponds with  `shop=charity`
+  - *Cheese Store*  corresponds with  `shop=cheese`
+  - *Drugstore*  corresponds with  `shop=chemist`
+  - *Chocolate Store*  corresponds with  `shop=chocolate`
+  - *Clothing Store*  corresponds with  `shop=clothes`
+  - *Coffee Store*  corresponds with  `shop=coffee`
+  - *Collectibles Shop*  corresponds with  `shop=collector`
+  - *Computer Store*  corresponds with  `shop=computer`
+  - *Candy Store*  corresponds with  `shop=confectionery`
+  - *Convenience Store*  corresponds with  `shop=convenience`
+  - *Copy Store*  corresponds with  `shop=copyshop`
+  - *Cosmetics Store*  corresponds with  `shop=cosmetics`
+  - *Rural Supplies Store*  corresponds with  `shop=country_store`
+  - *Arts & Crafts Store*  corresponds with  `shop=craft`
+  - *Curtain Store*  corresponds with  `shop=curtain`
+  - *Dairy Store*  corresponds with  `shop=dairy`
+  - *Delicatessen*  corresponds with  `shop=deli`
+  - *Department Store*  corresponds with  `shop=department_store`
+  - *DIY Store*  corresponds with  `shop=doityourself`
+  - *Door Shop*  corresponds with  `shop=doors`
+  - *Dry Cleaner*  corresponds with  `shop=dry_cleaning`
+  - *E-Cigarette Shop*  corresponds with  `shop=e-cigarette`
+  - *Electrical Equipment Store*  corresponds with  `shop=electrical`
+  - *Electronics Store*  corresponds with  `shop=electronics`
+  - *Erotic Store*  corresponds with  `shop=erotic`
+  - *Fabric Store*  corresponds with  `shop=fabric`
+  - *Produce Stand*  corresponds with  `shop=farm`
+  - *Fashion Accessories Store*  corresponds with  `shop=fashion_accessories`
+  - *Fireplace Store*  corresponds with  `shop=fireplace`
+  - *Fishing Shop*  corresponds with  `shop=fishing`
+  - *Flooring Supply Shop*  corresponds with  `shop=flooring`
+  - *Florist*  corresponds with  `shop=florist`
+  - *Framing Shop*  corresponds with  `shop=frame`
+  - *Frozen Food Store*  corresponds with  `shop=frozen_food`
+  - *Fuel Shop*  corresponds with  `shop=fuel`
+  - *Funeral Home*  corresponds with  `shop=funeral_directors`
+  - *Furniture Store*  corresponds with  `shop=furniture`
+  - *Tabletop Game Store*  corresponds with  `shop=games`
+  - *Garden Center*  corresponds with  `shop=garden_centre`
+  - *Bottled Gas Shop*  corresponds with  `shop=gas`
+  - *General Store*  corresponds with  `shop=general`
+  - *Gift Shop*  corresponds with  `shop=gift`
+  - *Greengrocer*  corresponds with  `shop=greengrocer`
+  - *Hairdresser*  corresponds with  `shop=hairdresser`
+  - *Hairdresser Supply Store*  corresponds with  `shop=hairdresser_supply`
+  - *Hardware Store*  corresponds with  `shop=hardware`
+  - *Health Food Store*  corresponds with  `shop=health_food`
+  - *Hearing Aids Store*  corresponds with  `shop=hearing_aids`
+  - *Herbalist*  corresponds with  `shop=herbalist`
+  - *Hifi Store*  corresponds with  `shop=hifi`
+  - *Honey Store*  corresponds with  `shop=honey`
+  - *Household Linen Shop*  corresponds with  `shop=household_linen`
+  - *Houseware Store*  corresponds with  `shop=houseware`
+  - *Hunting Shop*  corresponds with  `shop=hunting`
+  - *Interior Decoration Store*  corresponds with  `shop=interior_decoration`
+  - *Jewelry Store*  corresponds with  `shop=jewelry`
+  - *Kiosk*  corresponds with  `shop=kiosk`
+  - *Kitchen Design Store*  corresponds with  `shop=kitchen`
+  - *Laundry*  corresponds with  `shop=laundry`
+  - *Leather Store*  corresponds with  `shop=leather`
+  - *Lighting Store*  corresponds with  `shop=lighting`
+  - *Locksmith*  corresponds with  `shop=locksmith`
+  - *Lottery Shop*  corresponds with  `shop=lottery`
+  - *Mall*  corresponds with  `shop=mall`
+  - *Massage Shop*  corresponds with  `shop=massage`
+  - *Medical Supply Store*  corresponds with  `shop=medical_supply`
+  - *Military Surplus Store*  corresponds with  `shop=military_surplus`
+  - *Mobile Phone Store*  corresponds with  `shop=mobile_phone`
+  - *Model Shop*  corresponds with  `shop=model`
+  - *Money Lender*  corresponds with  `shop=money_lender`
+  - *Motorcycle Dealership*  corresponds with  `shop=motorcycle`
+  - *Motorcycle Repair Shop*  corresponds with  `shop=motorcycle_repair`
+  - *Music Store*  corresponds with  `shop=music`
+  - *Musical Instrument Store*  corresponds with  `shop=musical_instrument`
+  - *Newsstand*  corresponds with  `shop=newsagent`
+  - *Nutrition Supplements Store*  corresponds with  `shop=nutrition_supplements`
+  - *Nuts Shop*  corresponds with  `shop=nuts`
+  - *Optician*  corresponds with  `shop=optician`
+  - *Outdoors Store*  corresponds with  `shop=outdoor`
+  - *Online Retailer Outpost*  corresponds with  `shop=outpost`
+  - *Paint Store*  corresponds with  `shop=paint`
+  - *Party Supply Store*  corresponds with  `shop=party`
+  - *Pasta Store*  corresponds with  `shop=pasta`
+  - *Pastry Shop*  corresponds with  `shop=pastry`
+  - *Pawnshop*  corresponds with  `shop=pawnbroker`
+  - *Perfume Store*  corresponds with  `shop=perfumery`
+  - *Pet Store*  corresponds with  `shop=pet`
+  - *Pet Groomer*  corresponds with  `shop=pet_grooming`
+  - *Photography Store*  corresponds with  `shop=photo`
+  - *Pottery Store*  corresponds with  `shop=pottery`
+  - *Printer Ink Store*  corresponds with  `shop=printer_ink`
+  - *Psychic*  corresponds with  `shop=psychic`
+  - *Fireworks Store*  corresponds with  `shop=pyrotechnics`
+  - *Radio/Electronic Component Store*  corresponds with  `shop=radiotechnics`
+  - *Religious Store*  corresponds with  `shop=religion`
+  - *Rental Shop*  corresponds with  `shop=rental`
+  - *Repair Shop*  corresponds with  `shop=repair`
+  - *Rice Store*  corresponds with  `shop=rice`
+  - *Scuba Diving Shop*  corresponds with  `shop=scuba_diving`
+  - *Seafood Shop*  corresponds with  `shop=seafood`
+  - *Thrift Store*  corresponds with  `shop=second_hand`
+  - *Sewing Supply Shop*  corresponds with  `shop=sewing`
+  - *Shoe Repair Shop*  corresponds with  `shop=shoe_repair`
+  - *Shoe Store*  corresponds with  `shop=shoes`
+  - *Spice Shop*  corresponds with  `shop=spices`
+  - *Sporting Goods Store*  corresponds with  `shop=sports`
+  - *Stationery Store*  corresponds with  `shop=stationery`
+  - *Storage Rental*  corresponds with  `shop=storage_rental`
+  - *Supermarket*  corresponds with  `shop=supermarket`
+  - *Pool Supply Store*  corresponds with  `shop=swimming_pool`
+  - *Tailor*  corresponds with  `shop=tailor`
+  - *Tattoo Parlor*  corresponds with  `shop=tattoo`
+  - *Tea Store*  corresponds with  `shop=tea`
+  - *Telecom Retail Store*  corresponds with  `shop=telecommunication`
+  - *Ticket Seller*  corresponds with  `shop=ticket`
+  - *Tile Shop*  corresponds with  `shop=tiles`
+  - *Tobacco Shop*  corresponds with  `shop=tobacco`
+  - *Tool Rental*  corresponds with  `shop=tool_hire`
+  - *Toy Store*  corresponds with  `shop=toys`
+  - *Trade Shop*  corresponds with  `shop=trade`
+  - *Travel Agency*  corresponds with  `shop=travel_agency`
+  - *Trophy Shop*  corresponds with  `shop=trophy`
+  - *Tire Store*  corresponds with  `shop=tyres`
+  - *Vacuum Cleaner Store*  corresponds with  `shop=vacuum_cleaner`
+  - *Discount Store*  corresponds with  `shop=variety_store`
+  - *Video Store*  corresponds with  `shop=video`
+  - *Video Game Store*  corresponds with  `shop=video_games`
+  - *Watches Shop*  corresponds with  `shop=watches`
+  - *Drinking Water Shop*  corresponds with  `shop=water`
+  - *Watersport/Swim Shop*  corresponds with  `shop=water_sports`
+  - *Weapon Shop*  corresponds with  `shop=weapons`
+  - *Wholesale Store*  corresponds with  `shop=wholesale`
+  - *Wig Shop*  corresponds with  `shop=wigs`
+  - *Window Blind Store*  corresponds with  `shop=window_blind`
+  - *Wine Shop*  corresponds with  `shop=wine`
+
+
+
+
 ### opening_hours 
 
 
diff --git a/Docs/Layers/drinking_water.md b/Docs/Layers/drinking_water.md
index 9942749b8..57db3c141 100644
--- a/Docs/Layers/drinking_water.md
+++ b/Docs/Layers/drinking_water.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#6BC4F7;./assets/layers/drinking_water/drips.svg' height="100px"> 
+
 
 A layer showing drinking water fountains
 
diff --git a/Docs/Layers/education_institutions_without_etymology.md b/Docs/Layers/education_institutions_without_etymology.md
index 7d44a3350..c975ad42f 100644
--- a/Docs/Layers/education_institutions_without_etymology.md
+++ b/Docs/Layers/education_institutions_without_etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/elevator.md b/Docs/Layers/elevator.md
index 1da424300..28d760d19 100644
--- a/Docs/Layers/elevator.md
+++ b/Docs/Layers/elevator.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/elevator/elevator_wheelchair.svg' height="100px"> 
+
 
 This layer show elevators and asks for operational status and elevator dimensions. Useful for wheelchair accessibility information
 
diff --git a/Docs/Layers/elongated_coin.md b/Docs/Layers/elongated_coin.md
index 067b778d4..caee2d59f 100644
--- a/Docs/Layers/elongated_coin.md
+++ b/Docs/Layers/elongated_coin.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:#FFFFFF00;./assets/themes/elongated_coin/penny.svg' height="100px"> 
+
 
 Layer showing penny presses.
 
diff --git a/Docs/Layers/entrance.md b/Docs/Layers/entrance.md
index 88c0bc060..e9dff9523 100644
--- a/Docs/Layers/entrance.md
+++ b/Docs/Layers/entrance.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/entrance/entrance.svg' height="100px"> 
+
 
 A layer showing entrances and offering capabilities to survey some advanced data which is important for e.g. wheelchair users (but also bicycle users, people who want to deliver, …)
 
diff --git a/Docs/Layers/etymology.md b/Docs/Layers/etymology.md
index efa89c1d2..abc3b9e52 100644
--- a/Docs/Layers/etymology.md
+++ b/Docs/Layers/etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/extinguisher.md b/Docs/Layers/extinguisher.md
index a66a99075..1cfe9fae5 100644
--- a/Docs/Layers/extinguisher.md
+++ b/Docs/Layers/extinguisher.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/hailhydrant/Twemoji12_1f9ef.svg' height="100px"> 
+
 
 Map layer to show fire extinguishers.
 
diff --git a/Docs/Layers/fire_station.md b/Docs/Layers/fire_station.md
index 8d2c78525..8fd2b6fe8 100644
--- a/Docs/Layers/fire_station.md
+++ b/Docs/Layers/fire_station.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/hailhydrant/Twemoji12_1f692.svg' height="100px"> 
+
 
 Map layer to show fire stations.
 
diff --git a/Docs/Layers/fitness_centre.md b/Docs/Layers/fitness_centre.md
index 9d6483660..63eb517cf 100644
--- a/Docs/Layers/fitness_centre.md
+++ b/Docs/Layers/fitness_centre.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/fitness_centre/gym.svg' height="100px"> 
+
 
 Layer showing fitness centres
 
diff --git a/Docs/Layers/fitness_station.md b/Docs/Layers/fitness_station.md
index 94a3ae10a..43865e957 100644
--- a/Docs/Layers/fitness_station.md
+++ b/Docs/Layers/fitness_station.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/fitness_station/fitness.svg' height="100px"> 
+
 
 Find a fitness station near you, and add missing ones.
 
diff --git a/Docs/Layers/fixme.md b/Docs/Layers/fixme.md
index 27d29ce75..e1584d388 100644
--- a/Docs/Layers/fixme.md
+++ b/Docs/Layers/fixme.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/svg/bug.svg' height="100px"> 
+
 
 OSM objects that likely need to be fixed, based on a FIXME tag.
 
diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md
index 9f36f751e..dc5f7650d 100644
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/food/restaurant.svg' height="100px"> 
+
 
 A layer showing restaurants and fast-food amenities (with a special rendering for friteries)
 
diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md
index 7c61831c8..09d2218f8 100644
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/food/restaurant.svg' height="100px"> 
+
 
 A layer showing restaurants and fast-food amenities (with a special rendering for friteries)
 
diff --git a/Docs/Layers/ghost_bike.md b/Docs/Layers/ghost_bike.md
index 42c94fc94..f78368092 100644
--- a/Docs/Layers/ghost_bike.md
+++ b/Docs/Layers/ghost_bike.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/ghost_bike/ghost_bike.svg' height="100px"> 
+
 
 A layer showing memorials for cyclists, killed in road accidents
 
diff --git a/Docs/Layers/governments.md b/Docs/Layers/governments.md
index 972356e0a..3b6b0bbe2 100644
--- a/Docs/Layers/governments.md
+++ b/Docs/Layers/governments.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/governments/government.svg' height="100px"> 
+
 
 This layer show governmental buildings. It was setup as commissioned layer for the client of OSOC '22
 
diff --git a/Docs/Layers/guidepost.md b/Docs/Layers/guidepost.md
new file mode 100644
index 000000000..a450c2f08
--- /dev/null
+++ b/Docs/Layers/guidepost.md
@@ -0,0 +1,137 @@
+[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
+
+ guidepost 
+===========
+
+
+
+
+
+Guideposts (also known as fingerposts or finger posts) are often found along official hiking/cycling/riding/skiing routes to indicate the directions to different destinations
+
+
+
+
+
+
+  - This layer is shown at zoomlevel **14** and higher
+
+
+This is a special layer - data is not sourced from OpenStreetMap
+
+
+
+ Supported attributes 
+----------------------
+
+
+
+Warning: 
+
+this quick overview is incomplete
+
+
+
+attribute | type | values which are supported by this layer
+----------- | ------ | ------------------------------------------
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
+
+
+
+
+### just_created 
+
+
+
+This element shows a 'thank you' that the contributor has recently created this element
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+  - *You just created this element! Thanks for sharing this info with the world and helping people worldwide.*  corresponds with  `id~.+`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `_backend~.+&_last_edit:passed_time<300&|_version_number=1`
+
+
+
+### 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
+
+
+
+
+
+### leftover-questions 
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### minimap 
+
+
+
+Shows a small map with the feature. Added by default to every popup
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### move-button 
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### delete-button 
+
+
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
+### last_edit 
+
+
+
+Gives some metainfo about the last edit and who did edit it - rendering only
+
+This tagrendering has no question and is thus read-only
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `_last_edit:contributor~.+&_last_edit:changeset~.+`
+
+
+
+### all-tags 
+
+
+
+This tagrendering has no question and is thus read-only
+
+ 
+
+This document is autogenerated from [assets/layers/guidepost/guidepost.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/guidepost/guidepost.json)
diff --git a/Docs/Layers/hackerspace.md b/Docs/Layers/hackerspace.md
index dcf2e7d37..2f8211c5b 100644
--- a/Docs/Layers/hackerspace.md
+++ b/Docs/Layers/hackerspace.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/hackerspaces/glider.svg' height="100px"> 
+
 
 Hackerspace
 
diff --git a/Docs/Layers/health_and_social_places_without_etymology.md b/Docs/Layers/health_and_social_places_without_etymology.md
index 1bbd8f4e5..6b4c70809 100644
--- a/Docs/Layers/health_and_social_places_without_etymology.md
+++ b/Docs/Layers/health_and_social_places_without_etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/hospital.md b/Docs/Layers/hospital.md
index 72080c912..8c59e95d9 100644
--- a/Docs/Layers/hospital.md
+++ b/Docs/Layers/hospital.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/hospital/hospital.svg' height="100px"> 
+
 
 A layer showing hospital grounds
 
diff --git a/Docs/Layers/hotel.md b/Docs/Layers/hotel.md
index 49abe4609..630b4c9d9 100644
--- a/Docs/Layers/hotel.md
+++ b/Docs/Layers/hotel.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/hotel/hotel.svg' height="100px"> 
+
 
 Layer showing all hotels
 
diff --git a/Docs/Layers/hydrant.md b/Docs/Layers/hydrant.md
index c9d3fdd3b..7e4b617c4 100644
--- a/Docs/Layers/hydrant.md
+++ b/Docs/Layers/hydrant.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/hailhydrant/hydrant.svg' height="100px"> 
+
 
 Map layer to show fire hydrants.
 
diff --git a/Docs/Layers/indoors.md b/Docs/Layers/indoors.md
index 1de2eebfd..76a0e44b8 100644
--- a/Docs/Layers/indoors.md
+++ b/Docs/Layers/indoors.md
@@ -54,6 +54,18 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/room#values) [room](https://wiki.openstreetmap.org/wiki/Key:room) | Multiple choice | [administration](https://wiki.openstreetmap.org/wiki/Tag:room%3Dadministration) [auditorium](https://wiki.openstreetmap.org/wiki/Tag:room%3Dauditorium) [bedroom](https://wiki.openstreetmap.org/wiki/Tag:room%3Dbedroom) [chapel](https://wiki.openstreetmap.org/wiki/Tag:room%3Dchapel) [class](https://wiki.openstreetmap.org/wiki/Tag:room%3Dclass) [computer](https://wiki.openstreetmap.org/wiki/Tag:room%3Dcomputer) [conference](https://wiki.openstreetmap.org/wiki/Tag:room%3Dconference) [crypt](https://wiki.openstreetmap.org/wiki/Tag:room%3Dcrypt) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:room%3Dkitchen) [laboratory](https://wiki.openstreetmap.org/wiki/Tag:room%3Dlaboratory) [library](https://wiki.openstreetmap.org/wiki/Tag:room%3Dlibrary) [locker](https://wiki.openstreetmap.org/wiki/Tag:room%3Dlocker) [nursery](https://wiki.openstreetmap.org/wiki/Tag:room%3Dnursery) [office](https://wiki.openstreetmap.org/wiki/Tag:room%3Doffice) [prison_cell](https://wiki.openstreetmap.org/wiki/Tag:room%3Dprison_cell) [restaurant](https://wiki.openstreetmap.org/wiki/Tag:room%3Drestaurant) [security_check](https://wiki.openstreetmap.org/wiki/Tag:room%3Dsecurity_check) [sport](https://wiki.openstreetmap.org/wiki/Tag:room%3Dsport) [storage](https://wiki.openstreetmap.org/wiki/Tag:room%3Dstorage) [technical](https://wiki.openstreetmap.org/wiki/Tag:room%3Dtechnical) [toilets](https://wiki.openstreetmap.org/wiki/Tag:room%3Dtoilets) [waiting](https://wiki.openstreetmap.org/wiki/Tag:room%3Dwaiting)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity#values) [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name:etymology:wikidata#values) [name:etymology:wikidata](https://wiki.openstreetmap.org/wiki/Key:name:etymology:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/access#values) [access](https://wiki.openstreetmap.org/wiki/Key:access) | [string](../SpecialInputElements.md#string) | [yes](https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes) [customers](https://wiki.openstreetmap.org/wiki/Tag:access%3Dcustomers) [no](https://wiki.openstreetmap.org/wiki/Tag:access%3Dno) [key](https://wiki.openstreetmap.org/wiki/Tag:access%3Dkey)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/fee#values) [fee](https://wiki.openstreetmap.org/wiki/Key:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/wheelchair#values) [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/door:width#values) [door:width](https://wiki.openstreetmap.org/wiki/Key:door:width) | [pfloat](../SpecialInputElements.md#pfloat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:position#values) [toilets:position](https://wiki.openstreetmap.org/wiki/Key:toilets:position) | Multiple choice | [seated](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dseated) [urinal](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Durinal) [squat](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dsquat) [seated;urinal](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dseated;urinal)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/changing_table#values) [changing_table](https://wiki.openstreetmap.org/wiki/Key:changing_table) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:changing_table%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:changing_table%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/changing_table:location#values) [changing_table:location](https://wiki.openstreetmap.org/wiki/Key:changing_table:location) | [string](../SpecialInputElements.md#string) | [female_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dfemale_toilet) [male_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dmale_toilet) [wheelchair_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dwheelchair_toilet) [dedicated_room](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:handwashing#values) [toilets:handwashing](https://wiki.openstreetmap.org/wiki/Key:toilets:handwashing) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:paper_supplied#values) [toilets:paper_supplied](https://wiki.openstreetmap.org/wiki/Key:toilets:paper_supplied) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dno)
 
 
 
@@ -216,16 +228,290 @@ This tagrendering is only visible in the popup if the following condition is met
 
 
 
-### etymologywikipediaetymology 
+### wikipedia-etymology 
 
 
 
-This tagrendering has no question and is thus read-only
+The question is  *What is the Wikidata-item that this object is named after?*
+
+This rendering asks information about the property  [name:etymology:wikidata](https://wiki.openstreetmap.org/wiki/Key:name:etymology:wikidata) 
+
+This is rendered with  `<h3>Wikipedia article of the name giver</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}`
 
 
 
 
 
+### toilet-access 
+
+
+
+The question is  *Are these toilets publicly accessible?*
+
+This rendering asks information about the property  [access](https://wiki.openstreetmap.org/wiki/Key:access) 
+
+This is rendered with  `Access is {access}`
+
+
+
+
+
+  - *Public access*  corresponds with  `access=yes`
+  - *Only access to customers*  corresponds with  `access=customers`
+  - *Not accessible*  corresponds with  `access=no`
+  - *Accessible, but one has to ask a key to enter*  corresponds with  `access=key`
+  - *Public access*  corresponds with  `access=public`
+  - This option cannot be chosen as answer
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilets-fee 
+
+
+
+The question is  *Are these toilets free to use?*
+
+
+
+
+
+  - *These are paid toilets*  corresponds with  `fee=yes`
+  - *Free to use*  corresponds with  `fee=no`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets&access!=no`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilet-charge 
+
+
+
+The question is  *How much does one have to pay for these toilets?*
+
+This rendering asks information about the property  [charge](https://wiki.openstreetmap.org/wiki/Key:charge) 
+
+This is rendered with  `The fee is {charge}`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets&fee=yes`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### payment-options-split 
+
+
+
+The question is  *Which methods of payment are accepted here?*
+
+
+
+
+
+  - *Cash is accepted here*  corresponds with  `payment:cash=yes`
+  - This option cannot be chosen as answer
+  - Unselecting this answer will add 
+  - *Payment cards are accepted here*  corresponds with  `payment:cards=yes`
+  - This option cannot be chosen as answer
+  - Unselecting this answer will add 
+  - *Payment by QR-code is possible here*  corresponds with  `payment:qr_code=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:qr_code' target='_blank'>payment:qr_code</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:qr_code%3Dno' target='_blank'>no</a>
+  - *Coins are accepted here*  corresponds with  `payment:coins=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:coins' target='_blank'>payment:coins</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:coins%3Dno' target='_blank'>no</a>
+  - *Bank notes are accepted here*  corresponds with  `payment:notes=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:notes' target='_blank'>payment:notes</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:notes%3Dno' target='_blank'>no</a>
+  - *Debit cards are accepted here*  corresponds with  `payment:debit_cards=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:debit_cards' target='_blank'>payment:debit_cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:debit_cards%3Dno' target='_blank'>no</a>
+  - *Credit cards are accepted here*  corresponds with  `payment:credit_cards=yes`
+  - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:credit_cards' target='_blank'>payment:credit_cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:credit_cards%3Dno' target='_blank'>no</a>
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets&fee=yes`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### opening_hours_24_7 
+
+
+
+The question is  *When are these toilets opened?*
+
+This rendering asks information about the property  [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) 
+
+This is rendered with  `<h3>Opening hours</h3>{opening_hours_table(opening_hours)}`
+
+
+
+
+
+  - *24/7 opened (including holidays)*  corresponds with  `opening_hours=24/7`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets&access!=no`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilets-wheelchair 
+
+
+
+The question is  *Is there a dedicated toilet for wheelchair users?*
+
+
+
+
+
+  - *There is a dedicated toilet for wheelchair users*  corresponds with  `wheelchair=yes`
+  - *No wheelchair access*  corresponds with  `wheelchair=no`
+  - *There is only a dedicated toilet for wheelchair users*  corresponds with  `wheelchair=designated`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### wheelchair-door-width 
+
+
+
+The question is  *What is the width of the door to the wheelchair accessible toilet?*
+
+This rendering asks information about the property  [door:width](https://wiki.openstreetmap.org/wiki/Key:door:width) 
+
+This is rendered with  `The door to the wheelchair-accessible toilet is {canonical(door:width)} wide`
+
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets&wheelchair=yes|wheelchair=designated`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilets-type 
+
+
+
+The question is  *Which kind of toilets are this?*
+
+
+
+
+
+  - *There are only seated toilets*  corresponds with  `toilets:position=seated`
+  - *There are only urinals here*  corresponds with  `toilets:position=urinal`
+  - *There are only squat toilets here*  corresponds with  `toilets:position=squat`
+  - *Both seated toilets and urinals are available here*  corresponds with  `toilets:position=seated;urinal`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilets-changing-table 
+
+
+
+The question is  *Is a changing table (to change diapers) available?*
+
+
+
+
+
+  - *A changing table is available*  corresponds with  `changing_table=yes`
+  - *No changing table is available*  corresponds with  `changing_table=no`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilet-changing_table:location 
+
+
+
+The question is  *Where is the changing table located?*
+
+This rendering asks information about the property  [changing_table:location](https://wiki.openstreetmap.org/wiki/Key:changing_table:location) 
+
+This is rendered with  `The changing table is located at {changing_table:location}`
+
+
+
+
+
+  - *The changing table is in the toilet for women. *  corresponds with  `changing_table:location=female_toilet`
+  - *The changing table is in the toilet for men. *  corresponds with  `changing_table:location=male_toilet`
+  - *The changing table is in the toilet for wheelchair users. *  corresponds with  `changing_table:location=wheelchair_toilet`
+  - *The changing table is in a dedicated room. *  corresponds with  `changing_table:location=dedicated_room`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets&changing_table=yes`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilet-handwashing 
+
+
+
+The question is  *Do these toilets have a sink to wash your hands?*
+
+
+
+
+
+  - *This toilets have a sink to wash your hands*  corresponds with  `toilets:handwashing=yes`
+  - *This toilets <b>don't</b> have a sink to wash your hands*  corresponds with  `toilets:handwashing=no`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
+### toilet-has-paper 
+
+
+
+The question is  *Does one have to bring their own toilet paper to this toilet?*
+
+
+
+
+
+  - *This toilet is equipped with toilet paper*  corresponds with  `toilets:paper_supplied=yes`
+  - *You have to bring your own toilet paper to this toilet*  corresponds with  `toilets:paper_supplied=no`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `amenity=toilets&toilets:position!=urinal`
+
+This tagrendering has labels  `relevant-questions`
+
+
+
 ### leftover-questions 
 
 
diff --git a/Docs/Layers/information_board.md b/Docs/Layers/information_board.md
index 91a1e483a..2d4c18a82 100644
--- a/Docs/Layers/information_board.md
+++ b/Docs/Layers/information_board.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/information_board/board.svg' height="100px"> 
+
 
 A layer showing touristical, road side information boards (e.g. giving information about the landscape, a building, a feature, a map, …)
 
diff --git a/Docs/Layers/kerbs.md b/Docs/Layers/kerbs.md
index b507121f7..a1fce7292 100644
--- a/Docs/Layers/kerbs.md
+++ b/Docs/Layers/kerbs.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/kerbs/KerbIcon.svg' height="100px"> 
+
 
 A layer showing kerbs.
 
diff --git a/Docs/Layers/map.md b/Docs/Layers/map.md
index 356ce84e9..79a7f7c63 100644
--- a/Docs/Layers/map.md
+++ b/Docs/Layers/map.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/map/map.svg' height="100px"> 
+
 
 A map, meant for tourists which is permanently installed in the public space
 
diff --git a/Docs/Layers/maproulette.md b/Docs/Layers/maproulette.md
index 2b0ba2e15..37a46da46 100644
--- a/Docs/Layers/maproulette.md
+++ b/Docs/Layers/maproulette.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/maproulette/logomark.svg' height="100px"> 
+
 
 Layer showing all tasks in MapRoulette
 
diff --git a/Docs/Layers/maproulette_challenge.md b/Docs/Layers/maproulette_challenge.md
index ed3c2e770..ad32cd993 100644
--- a/Docs/Layers/maproulette_challenge.md
+++ b/Docs/Layers/maproulette_challenge.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/maproulette/logomark.svg' height="100px"> 
+
 
 Layer showing tasks of a single MapRoulette challenge. This layer is intended to be reused and extended in themes; refer to [the documentation](https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Integrating_Maproulette.md) on how to do this.
 
diff --git a/Docs/Layers/medical-shops.md b/Docs/Layers/medical-shops.md
index 62c0cc709..275e57892 100644
--- a/Docs/Layers/medical-shops.md
+++ b/Docs/Layers/medical-shops.md
@@ -47,6 +47,7 @@ attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [vacant](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacant) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
@@ -105,6 +106,188 @@ This is rendered with  `This shop is called <i>{name}</i>`
 
 
 
+### shop_types 
+
+
+
+The question is  *What kind of shop is this?*
+
+This rendering asks information about the property  [shop](https://wiki.openstreetmap.org/wiki/Key:shop) 
+
+This is rendered with  `This is a {shop}`
+
+
+
+
+
+  - *Vacant Shop*  corresponds with  `shop=vacant`
+  - *Farm Supply Shop*  corresponds with  `shop=agrarian`
+  - *Liquor Store*  corresponds with  `shop=alcohol`
+  - *Anime / Manga Shop*  corresponds with  `shop=anime`
+  - *Antique Shop*  corresponds with  `shop=antiques`
+  - *Appliance Store*  corresponds with  `shop=appliance`
+  - *Art Store*  corresponds with  `shop=art`
+  - *Baby Goods Store*  corresponds with  `shop=baby_goods`
+  - *Bag/Luggage Store*  corresponds with  `shop=bag`
+  - *Bakery*  corresponds with  `shop=bakery`
+  - *Bathroom Furnishing Store*  corresponds with  `shop=bathroom_furnishing`
+  - *Beauty Shop*  corresponds with  `shop=beauty`
+  - *Bedding/Mattress Store*  corresponds with  `shop=bed`
+  - *Beverage Store*  corresponds with  `shop=beverages`
+  - *Bicycle Shop*  corresponds with  `shop=bicycle`
+  - *Boat Store*  corresponds with  `shop=boat`
+  - *Bookmaker*  corresponds with  `shop=bookmaker`
+  - *Bookstore*  corresponds with  `shop=books`
+  - *Brewing Supply Store*  corresponds with  `shop=brewing_supplies`
+  - *Butcher*  corresponds with  `shop=butcher`
+  - *Camera Equipment Store*  corresponds with  `shop=camera`
+  - *Candle Shop*  corresponds with  `shop=candles`
+  - *Cannabis Shop*  corresponds with  `shop=cannabis`
+  - *Car Dealership*  corresponds with  `shop=car`
+  - *Car Parts Store*  corresponds with  `shop=car_parts`
+  - *Car Repair Shop*  corresponds with  `shop=car_repair`
+  - *RV Dealership*  corresponds with  `shop=caravan`
+  - *Carpet Store*  corresponds with  `shop=carpet`
+  - *Catalog Shop*  corresponds with  `shop=catalogue`
+  - *Charity Store*  corresponds with  `shop=charity`
+  - *Cheese Store*  corresponds with  `shop=cheese`
+  - *Drugstore*  corresponds with  `shop=chemist`
+  - *Chocolate Store*  corresponds with  `shop=chocolate`
+  - *Clothing Store*  corresponds with  `shop=clothes`
+  - *Coffee Store*  corresponds with  `shop=coffee`
+  - *Collectibles Shop*  corresponds with  `shop=collector`
+  - *Computer Store*  corresponds with  `shop=computer`
+  - *Candy Store*  corresponds with  `shop=confectionery`
+  - *Convenience Store*  corresponds with  `shop=convenience`
+  - *Copy Store*  corresponds with  `shop=copyshop`
+  - *Cosmetics Store*  corresponds with  `shop=cosmetics`
+  - *Rural Supplies Store*  corresponds with  `shop=country_store`
+  - *Arts & Crafts Store*  corresponds with  `shop=craft`
+  - *Curtain Store*  corresponds with  `shop=curtain`
+  - *Dairy Store*  corresponds with  `shop=dairy`
+  - *Delicatessen*  corresponds with  `shop=deli`
+  - *Department Store*  corresponds with  `shop=department_store`
+  - *DIY Store*  corresponds with  `shop=doityourself`
+  - *Door Shop*  corresponds with  `shop=doors`
+  - *Dry Cleaner*  corresponds with  `shop=dry_cleaning`
+  - *E-Cigarette Shop*  corresponds with  `shop=e-cigarette`
+  - *Electrical Equipment Store*  corresponds with  `shop=electrical`
+  - *Electronics Store*  corresponds with  `shop=electronics`
+  - *Erotic Store*  corresponds with  `shop=erotic`
+  - *Fabric Store*  corresponds with  `shop=fabric`
+  - *Produce Stand*  corresponds with  `shop=farm`
+  - *Fashion Accessories Store*  corresponds with  `shop=fashion_accessories`
+  - *Fireplace Store*  corresponds with  `shop=fireplace`
+  - *Fishing Shop*  corresponds with  `shop=fishing`
+  - *Flooring Supply Shop*  corresponds with  `shop=flooring`
+  - *Florist*  corresponds with  `shop=florist`
+  - *Framing Shop*  corresponds with  `shop=frame`
+  - *Frozen Food Store*  corresponds with  `shop=frozen_food`
+  - *Fuel Shop*  corresponds with  `shop=fuel`
+  - *Funeral Home*  corresponds with  `shop=funeral_directors`
+  - *Furniture Store*  corresponds with  `shop=furniture`
+  - *Tabletop Game Store*  corresponds with  `shop=games`
+  - *Garden Center*  corresponds with  `shop=garden_centre`
+  - *Bottled Gas Shop*  corresponds with  `shop=gas`
+  - *General Store*  corresponds with  `shop=general`
+  - *Gift Shop*  corresponds with  `shop=gift`
+  - *Greengrocer*  corresponds with  `shop=greengrocer`
+  - *Hairdresser*  corresponds with  `shop=hairdresser`
+  - *Hairdresser Supply Store*  corresponds with  `shop=hairdresser_supply`
+  - *Hardware Store*  corresponds with  `shop=hardware`
+  - *Health Food Store*  corresponds with  `shop=health_food`
+  - *Hearing Aids Store*  corresponds with  `shop=hearing_aids`
+  - *Herbalist*  corresponds with  `shop=herbalist`
+  - *Hifi Store*  corresponds with  `shop=hifi`
+  - *Honey Store*  corresponds with  `shop=honey`
+  - *Household Linen Shop*  corresponds with  `shop=household_linen`
+  - *Houseware Store*  corresponds with  `shop=houseware`
+  - *Hunting Shop*  corresponds with  `shop=hunting`
+  - *Interior Decoration Store*  corresponds with  `shop=interior_decoration`
+  - *Jewelry Store*  corresponds with  `shop=jewelry`
+  - *Kiosk*  corresponds with  `shop=kiosk`
+  - *Kitchen Design Store*  corresponds with  `shop=kitchen`
+  - *Laundry*  corresponds with  `shop=laundry`
+  - *Leather Store*  corresponds with  `shop=leather`
+  - *Lighting Store*  corresponds with  `shop=lighting`
+  - *Locksmith*  corresponds with  `shop=locksmith`
+  - *Lottery Shop*  corresponds with  `shop=lottery`
+  - *Mall*  corresponds with  `shop=mall`
+  - *Massage Shop*  corresponds with  `shop=massage`
+  - *Medical Supply Store*  corresponds with  `shop=medical_supply`
+  - *Military Surplus Store*  corresponds with  `shop=military_surplus`
+  - *Mobile Phone Store*  corresponds with  `shop=mobile_phone`
+  - *Model Shop*  corresponds with  `shop=model`
+  - *Money Lender*  corresponds with  `shop=money_lender`
+  - *Motorcycle Dealership*  corresponds with  `shop=motorcycle`
+  - *Motorcycle Repair Shop*  corresponds with  `shop=motorcycle_repair`
+  - *Music Store*  corresponds with  `shop=music`
+  - *Musical Instrument Store*  corresponds with  `shop=musical_instrument`
+  - *Newsstand*  corresponds with  `shop=newsagent`
+  - *Nutrition Supplements Store*  corresponds with  `shop=nutrition_supplements`
+  - *Nuts Shop*  corresponds with  `shop=nuts`
+  - *Optician*  corresponds with  `shop=optician`
+  - *Outdoors Store*  corresponds with  `shop=outdoor`
+  - *Online Retailer Outpost*  corresponds with  `shop=outpost`
+  - *Paint Store*  corresponds with  `shop=paint`
+  - *Party Supply Store*  corresponds with  `shop=party`
+  - *Pasta Store*  corresponds with  `shop=pasta`
+  - *Pastry Shop*  corresponds with  `shop=pastry`
+  - *Pawnshop*  corresponds with  `shop=pawnbroker`
+  - *Perfume Store*  corresponds with  `shop=perfumery`
+  - *Pet Store*  corresponds with  `shop=pet`
+  - *Pet Groomer*  corresponds with  `shop=pet_grooming`
+  - *Photography Store*  corresponds with  `shop=photo`
+  - *Pottery Store*  corresponds with  `shop=pottery`
+  - *Printer Ink Store*  corresponds with  `shop=printer_ink`
+  - *Psychic*  corresponds with  `shop=psychic`
+  - *Fireworks Store*  corresponds with  `shop=pyrotechnics`
+  - *Radio/Electronic Component Store*  corresponds with  `shop=radiotechnics`
+  - *Religious Store*  corresponds with  `shop=religion`
+  - *Rental Shop*  corresponds with  `shop=rental`
+  - *Repair Shop*  corresponds with  `shop=repair`
+  - *Rice Store*  corresponds with  `shop=rice`
+  - *Scuba Diving Shop*  corresponds with  `shop=scuba_diving`
+  - *Seafood Shop*  corresponds with  `shop=seafood`
+  - *Thrift Store*  corresponds with  `shop=second_hand`
+  - *Sewing Supply Shop*  corresponds with  `shop=sewing`
+  - *Shoe Repair Shop*  corresponds with  `shop=shoe_repair`
+  - *Shoe Store*  corresponds with  `shop=shoes`
+  - *Spice Shop*  corresponds with  `shop=spices`
+  - *Sporting Goods Store*  corresponds with  `shop=sports`
+  - *Stationery Store*  corresponds with  `shop=stationery`
+  - *Storage Rental*  corresponds with  `shop=storage_rental`
+  - *Supermarket*  corresponds with  `shop=supermarket`
+  - *Pool Supply Store*  corresponds with  `shop=swimming_pool`
+  - *Tailor*  corresponds with  `shop=tailor`
+  - *Tattoo Parlor*  corresponds with  `shop=tattoo`
+  - *Tea Store*  corresponds with  `shop=tea`
+  - *Telecom Retail Store*  corresponds with  `shop=telecommunication`
+  - *Ticket Seller*  corresponds with  `shop=ticket`
+  - *Tile Shop*  corresponds with  `shop=tiles`
+  - *Tobacco Shop*  corresponds with  `shop=tobacco`
+  - *Tool Rental*  corresponds with  `shop=tool_hire`
+  - *Toy Store*  corresponds with  `shop=toys`
+  - *Trade Shop*  corresponds with  `shop=trade`
+  - *Travel Agency*  corresponds with  `shop=travel_agency`
+  - *Trophy Shop*  corresponds with  `shop=trophy`
+  - *Tire Store*  corresponds with  `shop=tyres`
+  - *Vacuum Cleaner Store*  corresponds with  `shop=vacuum_cleaner`
+  - *Discount Store*  corresponds with  `shop=variety_store`
+  - *Video Store*  corresponds with  `shop=video`
+  - *Video Game Store*  corresponds with  `shop=video_games`
+  - *Watches Shop*  corresponds with  `shop=watches`
+  - *Drinking Water Shop*  corresponds with  `shop=water`
+  - *Watersport/Swim Shop*  corresponds with  `shop=water_sports`
+  - *Weapon Shop*  corresponds with  `shop=weapons`
+  - *Wholesale Store*  corresponds with  `shop=wholesale`
+  - *Wig Shop*  corresponds with  `shop=wigs`
+  - *Window Blind Store*  corresponds with  `shop=window_blind`
+  - *Wine Shop*  corresponds with  `shop=wine`
+
+
+
+
 ### opening_hours 
 
 
diff --git a/Docs/Layers/memorial.md b/Docs/Layers/memorial.md
index 9a0c26614..83ffd0861 100644
--- a/Docs/Layers/memorial.md
+++ b/Docs/Layers/memorial.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/memorial/plaque.svg' height="100px"> 
+
 
 Layer showing memorial plaques, based upon a unofficial theme. Can be expanded to have multiple types of memorials later on
 
diff --git a/Docs/Layers/nature_reserve.md b/Docs/Layers/nature_reserve.md
index 6a25bb9ae..3af715a66 100644
--- a/Docs/Layers/nature_reserve.md
+++ b/Docs/Layers/nature_reserve.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/nature_reserve/nature_reserve.svg' height="100px"> 
+
 
 A nature reserve is an area where nature can take its course
 
diff --git a/Docs/Layers/note.md b/Docs/Layers/note.md
index 50b4f1db6..386584e78 100644
--- a/Docs/Layers/note.md
+++ b/Docs/Layers/note.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/note' height="100px"> 
+
 
 This layer shows notes on OpenStreetMap. Having this layer in your theme will trigger the 'add new note' functionality in the 'addNewPoint'-popup (or if your theme has no presets, it'll enable adding notes)
 
diff --git a/Docs/Layers/observation_tower.md b/Docs/Layers/observation_tower.md
index 47dc36453..b2bd50097 100644
--- a/Docs/Layers/observation_tower.md
+++ b/Docs/Layers/observation_tower.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/observation_tower/Tower_observation.svg' height="100px"> 
+
 
 Towers with a panoramic view
 
diff --git a/Docs/Layers/osm_community_index.md b/Docs/Layers/osm_community_index.md
index 94f7da38d..a614f7450 100644
--- a/Docs/Layers/osm_community_index.md
+++ b/Docs/Layers/osm_community_index.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#6BC4F7;./assets/layers/osm_community_index/osm.svg' height="100px"> 
+
 
 A layer showing the OpenStreetMap Communities
 
diff --git a/Docs/Layers/parcel_lockers.md b/Docs/Layers/parcel_lockers.md
index d46c6021e..b37b128d6 100644
--- a/Docs/Layers/parcel_lockers.md
+++ b/Docs/Layers/parcel_lockers.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:white;./assets/layers/parcel_lockers/parcel_lockers.svg' height="100px"> 
+
 
 Layer showing parcel lockers for collecting and sending parcels.
 
diff --git a/Docs/Layers/parking.md b/Docs/Layers/parking.md
index 6856d586d..962a75b35 100644
--- a/Docs/Layers/parking.md
+++ b/Docs/Layers/parking.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/parking/parking.svg' height="100px"> 
+
 
 A layer showing car parkings
 
diff --git a/Docs/Layers/parking_spaces.md b/Docs/Layers/parking_spaces.md
index 23d9cf06f..fad212118 100644
--- a/Docs/Layers/parking_spaces.md
+++ b/Docs/Layers/parking_spaces.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/parking_spaces/parking_space.svg' height="100px"> 
+
 
 Layer showing individual parking spaces.
 
diff --git a/Docs/Layers/parking_ticket_machine.md b/Docs/Layers/parking_ticket_machine.md
index 84760f725..712e95d1c 100644
--- a/Docs/Layers/parking_ticket_machine.md
+++ b/Docs/Layers/parking_ticket_machine.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:white;./assets/layers/parking_ticket_machine/parking_tickets.svg' height="100px"> 
+
 
 Layer with parking ticket machines to pay for parking.
 
diff --git a/Docs/Layers/parks_and_forests_without_etymology.md b/Docs/Layers/parks_and_forests_without_etymology.md
index 0abbb8ef5..e91307198 100644
--- a/Docs/Layers/parks_and_forests_without_etymology.md
+++ b/Docs/Layers/parks_and_forests_without_etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/pedestrian_path.md b/Docs/Layers/pedestrian_path.md
index 02ff931dc..117ff3dc2 100644
--- a/Docs/Layers/pedestrian_path.md
+++ b/Docs/Layers/pedestrian_path.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/svg/bug.svg' height="100px"> 
+
 
 Pedestrian footpaths, especially used for indoor navigation and snapping entrances to this layer
 
diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md
index e25906e56..de3354f42 100644
--- a/Docs/Layers/pharmacy.md
+++ b/Docs/Layers/pharmacy.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/pharmacy/pharmacy.svg' height="100px"> 
+
 
 A layer showing pharmacies, which (probably) dispense prescription drugs
 
diff --git a/Docs/Layers/physiotherapist.md b/Docs/Layers/physiotherapist.md
index d8b177c5d..08e3cc1ad 100644
--- a/Docs/Layers/physiotherapist.md
+++ b/Docs/Layers/physiotherapist.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/physiotherapist/doctors.svg' height="100px"> 
+
 
 This layer shows physiotherapists
 
diff --git a/Docs/Layers/picnic_table.md b/Docs/Layers/picnic_table.md
index 089627951..c549a0203 100644
--- a/Docs/Layers/picnic_table.md
+++ b/Docs/Layers/picnic_table.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg' height="100px"> 
+
 
 The layer showing picnic tables
 
diff --git a/Docs/Layers/play_forest.md b/Docs/Layers/play_forest.md
index 034da95cd..060fb433d 100644
--- a/Docs/Layers/play_forest.md
+++ b/Docs/Layers/play_forest.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/play_forest/icon.svg' height="100px"> 
+
 
 Een speelbos is een vrij toegankelijke zone in een bos
 
diff --git a/Docs/Layers/playground.md b/Docs/Layers/playground.md
index f02e65595..7be594d82 100644
--- a/Docs/Layers/playground.md
+++ b/Docs/Layers/playground.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/playgrounds/playground.svg' height="100px"> 
+
 
 Playgrounds
 
diff --git a/Docs/Layers/post_offices_with_atm.md b/Docs/Layers/post_offices_with_atm.md
index 623b5615c..003eee696 100644
--- a/Docs/Layers/post_offices_with_atm.md
+++ b/Docs/Layers/post_offices_with_atm.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:white;./assets/layers/postoffices/post_office.svg' height="100px"> 
+
 
 A layer showing post offices.
 
diff --git a/Docs/Layers/postboxes.md b/Docs/Layers/postboxes.md
index 2d6864507..2c54c4269 100644
--- a/Docs/Layers/postboxes.md
+++ b/Docs/Layers/postboxes.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/postboxes/postbox.svg' height="100px"> 
+
 
 The layer showing postboxes.
 
diff --git a/Docs/Layers/postoffices.md b/Docs/Layers/postoffices.md
index ae2ee8340..a257e6100 100644
--- a/Docs/Layers/postoffices.md
+++ b/Docs/Layers/postoffices.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:white;./assets/layers/postoffices/post_office.svg' height="100px"> 
+
 
 A layer showing post offices.
 
diff --git a/Docs/Layers/public_bookcase.md b/Docs/Layers/public_bookcase.md
index 2583464a3..e21fc1364 100644
--- a/Docs/Layers/public_bookcase.md
+++ b/Docs/Layers/public_bookcase.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:#ffffff;./assets/themes/bookcases/bookcase.svg' height="100px"> 
+
 
 A streetside cabinet with books, accessible to anyone
 
diff --git a/Docs/Layers/railway_platforms.md b/Docs/Layers/railway_platforms.md
index 9e9a075d8..ba2027255 100644
--- a/Docs/Layers/railway_platforms.md
+++ b/Docs/Layers/railway_platforms.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/stations/rail-light.svg' height="100px"> 
+
 
 Find every platform in the station, and the train routes that use them.
 
diff --git a/Docs/Layers/rainbow_crossing_high_zoom.md b/Docs/Layers/rainbow_crossing_high_zoom.md
index 35cb22949..f2cae84c9 100644
--- a/Docs/Layers/rainbow_crossing_high_zoom.md
+++ b/Docs/Layers/rainbow_crossing_high_zoom.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/rainbow_crossings/crossing.svg' height="100px"> 
+
 
 A layer showing pedestrian crossings with rainbow paintings
 
diff --git a/Docs/Layers/rainbow_crossings.md b/Docs/Layers/rainbow_crossings.md
index e3c50abd7..4b092d6ba 100644
--- a/Docs/Layers/rainbow_crossings.md
+++ b/Docs/Layers/rainbow_crossings.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/rainbow_crossings/crossing.svg' height="100px"> 
+
 
 A layer showing pedestrian crossings with rainbow paintings
 
diff --git a/Docs/Layers/reception_desk.md b/Docs/Layers/reception_desk.md
index be0164aa8..ab03fef8c 100644
--- a/Docs/Layers/reception_desk.md
+++ b/Docs/Layers/reception_desk.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/reception_desk/reception_desk.svg' height="100px"> 
+
 
 A layer showing where the reception desks are and which asks some accessibility information
 
diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md
index 4157a5849..59b45eaa5 100644
--- a/Docs/Layers/recycling.md
+++ b/Docs/Layers/recycling.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/recycling/recycling-14.svg' height="100px"> 
+
 
 A layer with recycling containers and centres
 
diff --git a/Docs/Layers/school.md b/Docs/Layers/school.md
index 69d9c4859..bba2d01bf 100644
--- a/Docs/Layers/school.md
+++ b/Docs/Layers/school.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/school/school.svg' height="100px"> 
+
 
 Schools giving primary and secondary education and post-secondary, non-tertiary education. Note that this level of education does not imply an age of the pupiles
 
diff --git a/Docs/Layers/shelter.md b/Docs/Layers/shelter.md
index ce3561cf4..96522737a 100644
--- a/Docs/Layers/shelter.md
+++ b/Docs/Layers/shelter.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/shelter/shelter.svg' height="100px"> 
+
 
 Layer showing shelter structures
 
diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md
index 8af1a78e4..7f6121c75 100644
--- a/Docs/Layers/shops.md
+++ b/Docs/Layers/shops.md
@@ -52,6 +52,7 @@ attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [vacant](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacant) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
@@ -110,6 +111,188 @@ This is rendered with  `This shop is called <i>{name}</i>`
 
 
 
+### shop_types 
+
+
+
+The question is  *What kind of shop is this?*
+
+This rendering asks information about the property  [shop](https://wiki.openstreetmap.org/wiki/Key:shop) 
+
+This is rendered with  `This is a {shop}`
+
+
+
+
+
+  - *Vacant Shop*  corresponds with  `shop=vacant`
+  - *Farm Supply Shop*  corresponds with  `shop=agrarian`
+  - *Liquor Store*  corresponds with  `shop=alcohol`
+  - *Anime / Manga Shop*  corresponds with  `shop=anime`
+  - *Antique Shop*  corresponds with  `shop=antiques`
+  - *Appliance Store*  corresponds with  `shop=appliance`
+  - *Art Store*  corresponds with  `shop=art`
+  - *Baby Goods Store*  corresponds with  `shop=baby_goods`
+  - *Bag/Luggage Store*  corresponds with  `shop=bag`
+  - *Bakery*  corresponds with  `shop=bakery`
+  - *Bathroom Furnishing Store*  corresponds with  `shop=bathroom_furnishing`
+  - *Beauty Shop*  corresponds with  `shop=beauty`
+  - *Bedding/Mattress Store*  corresponds with  `shop=bed`
+  - *Beverage Store*  corresponds with  `shop=beverages`
+  - *Bicycle Shop*  corresponds with  `shop=bicycle`
+  - *Boat Store*  corresponds with  `shop=boat`
+  - *Bookmaker*  corresponds with  `shop=bookmaker`
+  - *Bookstore*  corresponds with  `shop=books`
+  - *Brewing Supply Store*  corresponds with  `shop=brewing_supplies`
+  - *Butcher*  corresponds with  `shop=butcher`
+  - *Camera Equipment Store*  corresponds with  `shop=camera`
+  - *Candle Shop*  corresponds with  `shop=candles`
+  - *Cannabis Shop*  corresponds with  `shop=cannabis`
+  - *Car Dealership*  corresponds with  `shop=car`
+  - *Car Parts Store*  corresponds with  `shop=car_parts`
+  - *Car Repair Shop*  corresponds with  `shop=car_repair`
+  - *RV Dealership*  corresponds with  `shop=caravan`
+  - *Carpet Store*  corresponds with  `shop=carpet`
+  - *Catalog Shop*  corresponds with  `shop=catalogue`
+  - *Charity Store*  corresponds with  `shop=charity`
+  - *Cheese Store*  corresponds with  `shop=cheese`
+  - *Drugstore*  corresponds with  `shop=chemist`
+  - *Chocolate Store*  corresponds with  `shop=chocolate`
+  - *Clothing Store*  corresponds with  `shop=clothes`
+  - *Coffee Store*  corresponds with  `shop=coffee`
+  - *Collectibles Shop*  corresponds with  `shop=collector`
+  - *Computer Store*  corresponds with  `shop=computer`
+  - *Candy Store*  corresponds with  `shop=confectionery`
+  - *Convenience Store*  corresponds with  `shop=convenience`
+  - *Copy Store*  corresponds with  `shop=copyshop`
+  - *Cosmetics Store*  corresponds with  `shop=cosmetics`
+  - *Rural Supplies Store*  corresponds with  `shop=country_store`
+  - *Arts & Crafts Store*  corresponds with  `shop=craft`
+  - *Curtain Store*  corresponds with  `shop=curtain`
+  - *Dairy Store*  corresponds with  `shop=dairy`
+  - *Delicatessen*  corresponds with  `shop=deli`
+  - *Department Store*  corresponds with  `shop=department_store`
+  - *DIY Store*  corresponds with  `shop=doityourself`
+  - *Door Shop*  corresponds with  `shop=doors`
+  - *Dry Cleaner*  corresponds with  `shop=dry_cleaning`
+  - *E-Cigarette Shop*  corresponds with  `shop=e-cigarette`
+  - *Electrical Equipment Store*  corresponds with  `shop=electrical`
+  - *Electronics Store*  corresponds with  `shop=electronics`
+  - *Erotic Store*  corresponds with  `shop=erotic`
+  - *Fabric Store*  corresponds with  `shop=fabric`
+  - *Produce Stand*  corresponds with  `shop=farm`
+  - *Fashion Accessories Store*  corresponds with  `shop=fashion_accessories`
+  - *Fireplace Store*  corresponds with  `shop=fireplace`
+  - *Fishing Shop*  corresponds with  `shop=fishing`
+  - *Flooring Supply Shop*  corresponds with  `shop=flooring`
+  - *Florist*  corresponds with  `shop=florist`
+  - *Framing Shop*  corresponds with  `shop=frame`
+  - *Frozen Food Store*  corresponds with  `shop=frozen_food`
+  - *Fuel Shop*  corresponds with  `shop=fuel`
+  - *Funeral Home*  corresponds with  `shop=funeral_directors`
+  - *Furniture Store*  corresponds with  `shop=furniture`
+  - *Tabletop Game Store*  corresponds with  `shop=games`
+  - *Garden Center*  corresponds with  `shop=garden_centre`
+  - *Bottled Gas Shop*  corresponds with  `shop=gas`
+  - *General Store*  corresponds with  `shop=general`
+  - *Gift Shop*  corresponds with  `shop=gift`
+  - *Greengrocer*  corresponds with  `shop=greengrocer`
+  - *Hairdresser*  corresponds with  `shop=hairdresser`
+  - *Hairdresser Supply Store*  corresponds with  `shop=hairdresser_supply`
+  - *Hardware Store*  corresponds with  `shop=hardware`
+  - *Health Food Store*  corresponds with  `shop=health_food`
+  - *Hearing Aids Store*  corresponds with  `shop=hearing_aids`
+  - *Herbalist*  corresponds with  `shop=herbalist`
+  - *Hifi Store*  corresponds with  `shop=hifi`
+  - *Honey Store*  corresponds with  `shop=honey`
+  - *Household Linen Shop*  corresponds with  `shop=household_linen`
+  - *Houseware Store*  corresponds with  `shop=houseware`
+  - *Hunting Shop*  corresponds with  `shop=hunting`
+  - *Interior Decoration Store*  corresponds with  `shop=interior_decoration`
+  - *Jewelry Store*  corresponds with  `shop=jewelry`
+  - *Kiosk*  corresponds with  `shop=kiosk`
+  - *Kitchen Design Store*  corresponds with  `shop=kitchen`
+  - *Laundry*  corresponds with  `shop=laundry`
+  - *Leather Store*  corresponds with  `shop=leather`
+  - *Lighting Store*  corresponds with  `shop=lighting`
+  - *Locksmith*  corresponds with  `shop=locksmith`
+  - *Lottery Shop*  corresponds with  `shop=lottery`
+  - *Mall*  corresponds with  `shop=mall`
+  - *Massage Shop*  corresponds with  `shop=massage`
+  - *Medical Supply Store*  corresponds with  `shop=medical_supply`
+  - *Military Surplus Store*  corresponds with  `shop=military_surplus`
+  - *Mobile Phone Store*  corresponds with  `shop=mobile_phone`
+  - *Model Shop*  corresponds with  `shop=model`
+  - *Money Lender*  corresponds with  `shop=money_lender`
+  - *Motorcycle Dealership*  corresponds with  `shop=motorcycle`
+  - *Motorcycle Repair Shop*  corresponds with  `shop=motorcycle_repair`
+  - *Music Store*  corresponds with  `shop=music`
+  - *Musical Instrument Store*  corresponds with  `shop=musical_instrument`
+  - *Newsstand*  corresponds with  `shop=newsagent`
+  - *Nutrition Supplements Store*  corresponds with  `shop=nutrition_supplements`
+  - *Nuts Shop*  corresponds with  `shop=nuts`
+  - *Optician*  corresponds with  `shop=optician`
+  - *Outdoors Store*  corresponds with  `shop=outdoor`
+  - *Online Retailer Outpost*  corresponds with  `shop=outpost`
+  - *Paint Store*  corresponds with  `shop=paint`
+  - *Party Supply Store*  corresponds with  `shop=party`
+  - *Pasta Store*  corresponds with  `shop=pasta`
+  - *Pastry Shop*  corresponds with  `shop=pastry`
+  - *Pawnshop*  corresponds with  `shop=pawnbroker`
+  - *Perfume Store*  corresponds with  `shop=perfumery`
+  - *Pet Store*  corresponds with  `shop=pet`
+  - *Pet Groomer*  corresponds with  `shop=pet_grooming`
+  - *Photography Store*  corresponds with  `shop=photo`
+  - *Pottery Store*  corresponds with  `shop=pottery`
+  - *Printer Ink Store*  corresponds with  `shop=printer_ink`
+  - *Psychic*  corresponds with  `shop=psychic`
+  - *Fireworks Store*  corresponds with  `shop=pyrotechnics`
+  - *Radio/Electronic Component Store*  corresponds with  `shop=radiotechnics`
+  - *Religious Store*  corresponds with  `shop=religion`
+  - *Rental Shop*  corresponds with  `shop=rental`
+  - *Repair Shop*  corresponds with  `shop=repair`
+  - *Rice Store*  corresponds with  `shop=rice`
+  - *Scuba Diving Shop*  corresponds with  `shop=scuba_diving`
+  - *Seafood Shop*  corresponds with  `shop=seafood`
+  - *Thrift Store*  corresponds with  `shop=second_hand`
+  - *Sewing Supply Shop*  corresponds with  `shop=sewing`
+  - *Shoe Repair Shop*  corresponds with  `shop=shoe_repair`
+  - *Shoe Store*  corresponds with  `shop=shoes`
+  - *Spice Shop*  corresponds with  `shop=spices`
+  - *Sporting Goods Store*  corresponds with  `shop=sports`
+  - *Stationery Store*  corresponds with  `shop=stationery`
+  - *Storage Rental*  corresponds with  `shop=storage_rental`
+  - *Supermarket*  corresponds with  `shop=supermarket`
+  - *Pool Supply Store*  corresponds with  `shop=swimming_pool`
+  - *Tailor*  corresponds with  `shop=tailor`
+  - *Tattoo Parlor*  corresponds with  `shop=tattoo`
+  - *Tea Store*  corresponds with  `shop=tea`
+  - *Telecom Retail Store*  corresponds with  `shop=telecommunication`
+  - *Ticket Seller*  corresponds with  `shop=ticket`
+  - *Tile Shop*  corresponds with  `shop=tiles`
+  - *Tobacco Shop*  corresponds with  `shop=tobacco`
+  - *Tool Rental*  corresponds with  `shop=tool_hire`
+  - *Toy Store*  corresponds with  `shop=toys`
+  - *Trade Shop*  corresponds with  `shop=trade`
+  - *Travel Agency*  corresponds with  `shop=travel_agency`
+  - *Trophy Shop*  corresponds with  `shop=trophy`
+  - *Tire Store*  corresponds with  `shop=tyres`
+  - *Vacuum Cleaner Store*  corresponds with  `shop=vacuum_cleaner`
+  - *Discount Store*  corresponds with  `shop=variety_store`
+  - *Video Store*  corresponds with  `shop=video`
+  - *Video Game Store*  corresponds with  `shop=video_games`
+  - *Watches Shop*  corresponds with  `shop=watches`
+  - *Drinking Water Shop*  corresponds with  `shop=water`
+  - *Watersport/Swim Shop*  corresponds with  `shop=water_sports`
+  - *Weapon Shop*  corresponds with  `shop=weapons`
+  - *Wholesale Store*  corresponds with  `shop=wholesale`
+  - *Wig Shop*  corresponds with  `shop=wigs`
+  - *Window Blind Store*  corresponds with  `shop=window_blind`
+  - *Wine Shop*  corresponds with  `shop=wine`
+
+
+
+
 ### opening_hours 
 
 
diff --git a/Docs/Layers/shops_with_climbing_shoe_repair.md b/Docs/Layers/shops_with_climbing_shoe_repair.md
index 634d49177..fb2274992 100644
--- a/Docs/Layers/shops_with_climbing_shoe_repair.md
+++ b/Docs/Layers/shops_with_climbing_shoe_repair.md
@@ -48,6 +48,7 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:climbing_shoes:repair#values) [service:climbing_shoes:repair](https://wiki.openstreetmap.org/wiki/Key:service:climbing_shoes:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:repair%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [vacant](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacant) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
@@ -122,6 +123,188 @@ This is rendered with  `This shop is called <i>{name}</i>`
 
 
 
+### shop_types 
+
+
+
+The question is  *What kind of shop is this?*
+
+This rendering asks information about the property  [shop](https://wiki.openstreetmap.org/wiki/Key:shop) 
+
+This is rendered with  `This is a {shop}`
+
+
+
+
+
+  - *Vacant Shop*  corresponds with  `shop=vacant`
+  - *Farm Supply Shop*  corresponds with  `shop=agrarian`
+  - *Liquor Store*  corresponds with  `shop=alcohol`
+  - *Anime / Manga Shop*  corresponds with  `shop=anime`
+  - *Antique Shop*  corresponds with  `shop=antiques`
+  - *Appliance Store*  corresponds with  `shop=appliance`
+  - *Art Store*  corresponds with  `shop=art`
+  - *Baby Goods Store*  corresponds with  `shop=baby_goods`
+  - *Bag/Luggage Store*  corresponds with  `shop=bag`
+  - *Bakery*  corresponds with  `shop=bakery`
+  - *Bathroom Furnishing Store*  corresponds with  `shop=bathroom_furnishing`
+  - *Beauty Shop*  corresponds with  `shop=beauty`
+  - *Bedding/Mattress Store*  corresponds with  `shop=bed`
+  - *Beverage Store*  corresponds with  `shop=beverages`
+  - *Bicycle Shop*  corresponds with  `shop=bicycle`
+  - *Boat Store*  corresponds with  `shop=boat`
+  - *Bookmaker*  corresponds with  `shop=bookmaker`
+  - *Bookstore*  corresponds with  `shop=books`
+  - *Brewing Supply Store*  corresponds with  `shop=brewing_supplies`
+  - *Butcher*  corresponds with  `shop=butcher`
+  - *Camera Equipment Store*  corresponds with  `shop=camera`
+  - *Candle Shop*  corresponds with  `shop=candles`
+  - *Cannabis Shop*  corresponds with  `shop=cannabis`
+  - *Car Dealership*  corresponds with  `shop=car`
+  - *Car Parts Store*  corresponds with  `shop=car_parts`
+  - *Car Repair Shop*  corresponds with  `shop=car_repair`
+  - *RV Dealership*  corresponds with  `shop=caravan`
+  - *Carpet Store*  corresponds with  `shop=carpet`
+  - *Catalog Shop*  corresponds with  `shop=catalogue`
+  - *Charity Store*  corresponds with  `shop=charity`
+  - *Cheese Store*  corresponds with  `shop=cheese`
+  - *Drugstore*  corresponds with  `shop=chemist`
+  - *Chocolate Store*  corresponds with  `shop=chocolate`
+  - *Clothing Store*  corresponds with  `shop=clothes`
+  - *Coffee Store*  corresponds with  `shop=coffee`
+  - *Collectibles Shop*  corresponds with  `shop=collector`
+  - *Computer Store*  corresponds with  `shop=computer`
+  - *Candy Store*  corresponds with  `shop=confectionery`
+  - *Convenience Store*  corresponds with  `shop=convenience`
+  - *Copy Store*  corresponds with  `shop=copyshop`
+  - *Cosmetics Store*  corresponds with  `shop=cosmetics`
+  - *Rural Supplies Store*  corresponds with  `shop=country_store`
+  - *Arts & Crafts Store*  corresponds with  `shop=craft`
+  - *Curtain Store*  corresponds with  `shop=curtain`
+  - *Dairy Store*  corresponds with  `shop=dairy`
+  - *Delicatessen*  corresponds with  `shop=deli`
+  - *Department Store*  corresponds with  `shop=department_store`
+  - *DIY Store*  corresponds with  `shop=doityourself`
+  - *Door Shop*  corresponds with  `shop=doors`
+  - *Dry Cleaner*  corresponds with  `shop=dry_cleaning`
+  - *E-Cigarette Shop*  corresponds with  `shop=e-cigarette`
+  - *Electrical Equipment Store*  corresponds with  `shop=electrical`
+  - *Electronics Store*  corresponds with  `shop=electronics`
+  - *Erotic Store*  corresponds with  `shop=erotic`
+  - *Fabric Store*  corresponds with  `shop=fabric`
+  - *Produce Stand*  corresponds with  `shop=farm`
+  - *Fashion Accessories Store*  corresponds with  `shop=fashion_accessories`
+  - *Fireplace Store*  corresponds with  `shop=fireplace`
+  - *Fishing Shop*  corresponds with  `shop=fishing`
+  - *Flooring Supply Shop*  corresponds with  `shop=flooring`
+  - *Florist*  corresponds with  `shop=florist`
+  - *Framing Shop*  corresponds with  `shop=frame`
+  - *Frozen Food Store*  corresponds with  `shop=frozen_food`
+  - *Fuel Shop*  corresponds with  `shop=fuel`
+  - *Funeral Home*  corresponds with  `shop=funeral_directors`
+  - *Furniture Store*  corresponds with  `shop=furniture`
+  - *Tabletop Game Store*  corresponds with  `shop=games`
+  - *Garden Center*  corresponds with  `shop=garden_centre`
+  - *Bottled Gas Shop*  corresponds with  `shop=gas`
+  - *General Store*  corresponds with  `shop=general`
+  - *Gift Shop*  corresponds with  `shop=gift`
+  - *Greengrocer*  corresponds with  `shop=greengrocer`
+  - *Hairdresser*  corresponds with  `shop=hairdresser`
+  - *Hairdresser Supply Store*  corresponds with  `shop=hairdresser_supply`
+  - *Hardware Store*  corresponds with  `shop=hardware`
+  - *Health Food Store*  corresponds with  `shop=health_food`
+  - *Hearing Aids Store*  corresponds with  `shop=hearing_aids`
+  - *Herbalist*  corresponds with  `shop=herbalist`
+  - *Hifi Store*  corresponds with  `shop=hifi`
+  - *Honey Store*  corresponds with  `shop=honey`
+  - *Household Linen Shop*  corresponds with  `shop=household_linen`
+  - *Houseware Store*  corresponds with  `shop=houseware`
+  - *Hunting Shop*  corresponds with  `shop=hunting`
+  - *Interior Decoration Store*  corresponds with  `shop=interior_decoration`
+  - *Jewelry Store*  corresponds with  `shop=jewelry`
+  - *Kiosk*  corresponds with  `shop=kiosk`
+  - *Kitchen Design Store*  corresponds with  `shop=kitchen`
+  - *Laundry*  corresponds with  `shop=laundry`
+  - *Leather Store*  corresponds with  `shop=leather`
+  - *Lighting Store*  corresponds with  `shop=lighting`
+  - *Locksmith*  corresponds with  `shop=locksmith`
+  - *Lottery Shop*  corresponds with  `shop=lottery`
+  - *Mall*  corresponds with  `shop=mall`
+  - *Massage Shop*  corresponds with  `shop=massage`
+  - *Medical Supply Store*  corresponds with  `shop=medical_supply`
+  - *Military Surplus Store*  corresponds with  `shop=military_surplus`
+  - *Mobile Phone Store*  corresponds with  `shop=mobile_phone`
+  - *Model Shop*  corresponds with  `shop=model`
+  - *Money Lender*  corresponds with  `shop=money_lender`
+  - *Motorcycle Dealership*  corresponds with  `shop=motorcycle`
+  - *Motorcycle Repair Shop*  corresponds with  `shop=motorcycle_repair`
+  - *Music Store*  corresponds with  `shop=music`
+  - *Musical Instrument Store*  corresponds with  `shop=musical_instrument`
+  - *Newsstand*  corresponds with  `shop=newsagent`
+  - *Nutrition Supplements Store*  corresponds with  `shop=nutrition_supplements`
+  - *Nuts Shop*  corresponds with  `shop=nuts`
+  - *Optician*  corresponds with  `shop=optician`
+  - *Outdoors Store*  corresponds with  `shop=outdoor`
+  - *Online Retailer Outpost*  corresponds with  `shop=outpost`
+  - *Paint Store*  corresponds with  `shop=paint`
+  - *Party Supply Store*  corresponds with  `shop=party`
+  - *Pasta Store*  corresponds with  `shop=pasta`
+  - *Pastry Shop*  corresponds with  `shop=pastry`
+  - *Pawnshop*  corresponds with  `shop=pawnbroker`
+  - *Perfume Store*  corresponds with  `shop=perfumery`
+  - *Pet Store*  corresponds with  `shop=pet`
+  - *Pet Groomer*  corresponds with  `shop=pet_grooming`
+  - *Photography Store*  corresponds with  `shop=photo`
+  - *Pottery Store*  corresponds with  `shop=pottery`
+  - *Printer Ink Store*  corresponds with  `shop=printer_ink`
+  - *Psychic*  corresponds with  `shop=psychic`
+  - *Fireworks Store*  corresponds with  `shop=pyrotechnics`
+  - *Radio/Electronic Component Store*  corresponds with  `shop=radiotechnics`
+  - *Religious Store*  corresponds with  `shop=religion`
+  - *Rental Shop*  corresponds with  `shop=rental`
+  - *Repair Shop*  corresponds with  `shop=repair`
+  - *Rice Store*  corresponds with  `shop=rice`
+  - *Scuba Diving Shop*  corresponds with  `shop=scuba_diving`
+  - *Seafood Shop*  corresponds with  `shop=seafood`
+  - *Thrift Store*  corresponds with  `shop=second_hand`
+  - *Sewing Supply Shop*  corresponds with  `shop=sewing`
+  - *Shoe Repair Shop*  corresponds with  `shop=shoe_repair`
+  - *Shoe Store*  corresponds with  `shop=shoes`
+  - *Spice Shop*  corresponds with  `shop=spices`
+  - *Sporting Goods Store*  corresponds with  `shop=sports`
+  - *Stationery Store*  corresponds with  `shop=stationery`
+  - *Storage Rental*  corresponds with  `shop=storage_rental`
+  - *Supermarket*  corresponds with  `shop=supermarket`
+  - *Pool Supply Store*  corresponds with  `shop=swimming_pool`
+  - *Tailor*  corresponds with  `shop=tailor`
+  - *Tattoo Parlor*  corresponds with  `shop=tattoo`
+  - *Tea Store*  corresponds with  `shop=tea`
+  - *Telecom Retail Store*  corresponds with  `shop=telecommunication`
+  - *Ticket Seller*  corresponds with  `shop=ticket`
+  - *Tile Shop*  corresponds with  `shop=tiles`
+  - *Tobacco Shop*  corresponds with  `shop=tobacco`
+  - *Tool Rental*  corresponds with  `shop=tool_hire`
+  - *Toy Store*  corresponds with  `shop=toys`
+  - *Trade Shop*  corresponds with  `shop=trade`
+  - *Travel Agency*  corresponds with  `shop=travel_agency`
+  - *Trophy Shop*  corresponds with  `shop=trophy`
+  - *Tire Store*  corresponds with  `shop=tyres`
+  - *Vacuum Cleaner Store*  corresponds with  `shop=vacuum_cleaner`
+  - *Discount Store*  corresponds with  `shop=variety_store`
+  - *Video Store*  corresponds with  `shop=video`
+  - *Video Game Store*  corresponds with  `shop=video_games`
+  - *Watches Shop*  corresponds with  `shop=watches`
+  - *Drinking Water Shop*  corresponds with  `shop=water`
+  - *Watersport/Swim Shop*  corresponds with  `shop=water_sports`
+  - *Weapon Shop*  corresponds with  `shop=weapons`
+  - *Wholesale Store*  corresponds with  `shop=wholesale`
+  - *Wig Shop*  corresponds with  `shop=wigs`
+  - *Window Blind Store*  corresponds with  `shop=window_blind`
+  - *Wine Shop*  corresponds with  `shop=wine`
+
+
+
+
 ### opening_hours 
 
 
diff --git a/Docs/Layers/shower.md b/Docs/Layers/shower.md
index 28edf884c..21b768df1 100644
--- a/Docs/Layers/shower.md
+++ b/Docs/Layers/shower.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/shower/shower.svg' height="100px"> 
+
 
 A layer showing (public) showers
 
diff --git a/Docs/Layers/slow_roads.md b/Docs/Layers/slow_roads.md
index 417dbaa24..6ddfbe7c4 100644
--- a/Docs/Layers/slow_roads.md
+++ b/Docs/Layers/slow_roads.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/slow_roads/slow_road.svg' height="100px"> 
+
 
 All carfree roads
 
diff --git a/Docs/Layers/speed_camera.md b/Docs/Layers/speed_camera.md
index 792ea53be..6e974176c 100644
--- a/Docs/Layers/speed_camera.md
+++ b/Docs/Layers/speed_camera.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:white;./assets/layers/speed_camera/speed_camera.svg' height="100px"> 
+
 
 Layer showing speed cameras
 
diff --git a/Docs/Layers/speed_display.md b/Docs/Layers/speed_display.md
index d710d1a1b..f7ec7a149 100644
--- a/Docs/Layers/speed_display.md
+++ b/Docs/Layers/speed_display.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/speed_display/speed_display.svg' height="100px"> 
+
 
 Layer showing speed displays that alert drivers of their speed.
 
diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md
index dce2efb07..21061001a 100644
--- a/Docs/Layers/sport_pitch.md
+++ b/Docs/Layers/sport_pitch.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/sport_pitch/sport_pitch.svg' height="100px"> 
+
 
 A sport pitch
 
diff --git a/Docs/Layers/sport_places_without_etymology.md b/Docs/Layers/sport_places_without_etymology.md
index d8243531e..bbc438af3 100644
--- a/Docs/Layers/sport_places_without_etymology.md
+++ b/Docs/Layers/sport_places_without_etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md
index abfc76b2e..734dbea9e 100644
--- a/Docs/Layers/sport_shops.md
+++ b/Docs/Layers/sport_shops.md
@@ -47,6 +47,7 @@ attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/shop#values) [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [vacant](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacant) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
@@ -105,6 +106,188 @@ This is rendered with  `This shop is called <i>{name}</i>`
 
 
 
+### shop_types 
+
+
+
+The question is  *What kind of shop is this?*
+
+This rendering asks information about the property  [shop](https://wiki.openstreetmap.org/wiki/Key:shop) 
+
+This is rendered with  `This is a {shop}`
+
+
+
+
+
+  - *Vacant Shop*  corresponds with  `shop=vacant`
+  - *Farm Supply Shop*  corresponds with  `shop=agrarian`
+  - *Liquor Store*  corresponds with  `shop=alcohol`
+  - *Anime / Manga Shop*  corresponds with  `shop=anime`
+  - *Antique Shop*  corresponds with  `shop=antiques`
+  - *Appliance Store*  corresponds with  `shop=appliance`
+  - *Art Store*  corresponds with  `shop=art`
+  - *Baby Goods Store*  corresponds with  `shop=baby_goods`
+  - *Bag/Luggage Store*  corresponds with  `shop=bag`
+  - *Bakery*  corresponds with  `shop=bakery`
+  - *Bathroom Furnishing Store*  corresponds with  `shop=bathroom_furnishing`
+  - *Beauty Shop*  corresponds with  `shop=beauty`
+  - *Bedding/Mattress Store*  corresponds with  `shop=bed`
+  - *Beverage Store*  corresponds with  `shop=beverages`
+  - *Bicycle Shop*  corresponds with  `shop=bicycle`
+  - *Boat Store*  corresponds with  `shop=boat`
+  - *Bookmaker*  corresponds with  `shop=bookmaker`
+  - *Bookstore*  corresponds with  `shop=books`
+  - *Brewing Supply Store*  corresponds with  `shop=brewing_supplies`
+  - *Butcher*  corresponds with  `shop=butcher`
+  - *Camera Equipment Store*  corresponds with  `shop=camera`
+  - *Candle Shop*  corresponds with  `shop=candles`
+  - *Cannabis Shop*  corresponds with  `shop=cannabis`
+  - *Car Dealership*  corresponds with  `shop=car`
+  - *Car Parts Store*  corresponds with  `shop=car_parts`
+  - *Car Repair Shop*  corresponds with  `shop=car_repair`
+  - *RV Dealership*  corresponds with  `shop=caravan`
+  - *Carpet Store*  corresponds with  `shop=carpet`
+  - *Catalog Shop*  corresponds with  `shop=catalogue`
+  - *Charity Store*  corresponds with  `shop=charity`
+  - *Cheese Store*  corresponds with  `shop=cheese`
+  - *Drugstore*  corresponds with  `shop=chemist`
+  - *Chocolate Store*  corresponds with  `shop=chocolate`
+  - *Clothing Store*  corresponds with  `shop=clothes`
+  - *Coffee Store*  corresponds with  `shop=coffee`
+  - *Collectibles Shop*  corresponds with  `shop=collector`
+  - *Computer Store*  corresponds with  `shop=computer`
+  - *Candy Store*  corresponds with  `shop=confectionery`
+  - *Convenience Store*  corresponds with  `shop=convenience`
+  - *Copy Store*  corresponds with  `shop=copyshop`
+  - *Cosmetics Store*  corresponds with  `shop=cosmetics`
+  - *Rural Supplies Store*  corresponds with  `shop=country_store`
+  - *Arts & Crafts Store*  corresponds with  `shop=craft`
+  - *Curtain Store*  corresponds with  `shop=curtain`
+  - *Dairy Store*  corresponds with  `shop=dairy`
+  - *Delicatessen*  corresponds with  `shop=deli`
+  - *Department Store*  corresponds with  `shop=department_store`
+  - *DIY Store*  corresponds with  `shop=doityourself`
+  - *Door Shop*  corresponds with  `shop=doors`
+  - *Dry Cleaner*  corresponds with  `shop=dry_cleaning`
+  - *E-Cigarette Shop*  corresponds with  `shop=e-cigarette`
+  - *Electrical Equipment Store*  corresponds with  `shop=electrical`
+  - *Electronics Store*  corresponds with  `shop=electronics`
+  - *Erotic Store*  corresponds with  `shop=erotic`
+  - *Fabric Store*  corresponds with  `shop=fabric`
+  - *Produce Stand*  corresponds with  `shop=farm`
+  - *Fashion Accessories Store*  corresponds with  `shop=fashion_accessories`
+  - *Fireplace Store*  corresponds with  `shop=fireplace`
+  - *Fishing Shop*  corresponds with  `shop=fishing`
+  - *Flooring Supply Shop*  corresponds with  `shop=flooring`
+  - *Florist*  corresponds with  `shop=florist`
+  - *Framing Shop*  corresponds with  `shop=frame`
+  - *Frozen Food Store*  corresponds with  `shop=frozen_food`
+  - *Fuel Shop*  corresponds with  `shop=fuel`
+  - *Funeral Home*  corresponds with  `shop=funeral_directors`
+  - *Furniture Store*  corresponds with  `shop=furniture`
+  - *Tabletop Game Store*  corresponds with  `shop=games`
+  - *Garden Center*  corresponds with  `shop=garden_centre`
+  - *Bottled Gas Shop*  corresponds with  `shop=gas`
+  - *General Store*  corresponds with  `shop=general`
+  - *Gift Shop*  corresponds with  `shop=gift`
+  - *Greengrocer*  corresponds with  `shop=greengrocer`
+  - *Hairdresser*  corresponds with  `shop=hairdresser`
+  - *Hairdresser Supply Store*  corresponds with  `shop=hairdresser_supply`
+  - *Hardware Store*  corresponds with  `shop=hardware`
+  - *Health Food Store*  corresponds with  `shop=health_food`
+  - *Hearing Aids Store*  corresponds with  `shop=hearing_aids`
+  - *Herbalist*  corresponds with  `shop=herbalist`
+  - *Hifi Store*  corresponds with  `shop=hifi`
+  - *Honey Store*  corresponds with  `shop=honey`
+  - *Household Linen Shop*  corresponds with  `shop=household_linen`
+  - *Houseware Store*  corresponds with  `shop=houseware`
+  - *Hunting Shop*  corresponds with  `shop=hunting`
+  - *Interior Decoration Store*  corresponds with  `shop=interior_decoration`
+  - *Jewelry Store*  corresponds with  `shop=jewelry`
+  - *Kiosk*  corresponds with  `shop=kiosk`
+  - *Kitchen Design Store*  corresponds with  `shop=kitchen`
+  - *Laundry*  corresponds with  `shop=laundry`
+  - *Leather Store*  corresponds with  `shop=leather`
+  - *Lighting Store*  corresponds with  `shop=lighting`
+  - *Locksmith*  corresponds with  `shop=locksmith`
+  - *Lottery Shop*  corresponds with  `shop=lottery`
+  - *Mall*  corresponds with  `shop=mall`
+  - *Massage Shop*  corresponds with  `shop=massage`
+  - *Medical Supply Store*  corresponds with  `shop=medical_supply`
+  - *Military Surplus Store*  corresponds with  `shop=military_surplus`
+  - *Mobile Phone Store*  corresponds with  `shop=mobile_phone`
+  - *Model Shop*  corresponds with  `shop=model`
+  - *Money Lender*  corresponds with  `shop=money_lender`
+  - *Motorcycle Dealership*  corresponds with  `shop=motorcycle`
+  - *Motorcycle Repair Shop*  corresponds with  `shop=motorcycle_repair`
+  - *Music Store*  corresponds with  `shop=music`
+  - *Musical Instrument Store*  corresponds with  `shop=musical_instrument`
+  - *Newsstand*  corresponds with  `shop=newsagent`
+  - *Nutrition Supplements Store*  corresponds with  `shop=nutrition_supplements`
+  - *Nuts Shop*  corresponds with  `shop=nuts`
+  - *Optician*  corresponds with  `shop=optician`
+  - *Outdoors Store*  corresponds with  `shop=outdoor`
+  - *Online Retailer Outpost*  corresponds with  `shop=outpost`
+  - *Paint Store*  corresponds with  `shop=paint`
+  - *Party Supply Store*  corresponds with  `shop=party`
+  - *Pasta Store*  corresponds with  `shop=pasta`
+  - *Pastry Shop*  corresponds with  `shop=pastry`
+  - *Pawnshop*  corresponds with  `shop=pawnbroker`
+  - *Perfume Store*  corresponds with  `shop=perfumery`
+  - *Pet Store*  corresponds with  `shop=pet`
+  - *Pet Groomer*  corresponds with  `shop=pet_grooming`
+  - *Photography Store*  corresponds with  `shop=photo`
+  - *Pottery Store*  corresponds with  `shop=pottery`
+  - *Printer Ink Store*  corresponds with  `shop=printer_ink`
+  - *Psychic*  corresponds with  `shop=psychic`
+  - *Fireworks Store*  corresponds with  `shop=pyrotechnics`
+  - *Radio/Electronic Component Store*  corresponds with  `shop=radiotechnics`
+  - *Religious Store*  corresponds with  `shop=religion`
+  - *Rental Shop*  corresponds with  `shop=rental`
+  - *Repair Shop*  corresponds with  `shop=repair`
+  - *Rice Store*  corresponds with  `shop=rice`
+  - *Scuba Diving Shop*  corresponds with  `shop=scuba_diving`
+  - *Seafood Shop*  corresponds with  `shop=seafood`
+  - *Thrift Store*  corresponds with  `shop=second_hand`
+  - *Sewing Supply Shop*  corresponds with  `shop=sewing`
+  - *Shoe Repair Shop*  corresponds with  `shop=shoe_repair`
+  - *Shoe Store*  corresponds with  `shop=shoes`
+  - *Spice Shop*  corresponds with  `shop=spices`
+  - *Sporting Goods Store*  corresponds with  `shop=sports`
+  - *Stationery Store*  corresponds with  `shop=stationery`
+  - *Storage Rental*  corresponds with  `shop=storage_rental`
+  - *Supermarket*  corresponds with  `shop=supermarket`
+  - *Pool Supply Store*  corresponds with  `shop=swimming_pool`
+  - *Tailor*  corresponds with  `shop=tailor`
+  - *Tattoo Parlor*  corresponds with  `shop=tattoo`
+  - *Tea Store*  corresponds with  `shop=tea`
+  - *Telecom Retail Store*  corresponds with  `shop=telecommunication`
+  - *Ticket Seller*  corresponds with  `shop=ticket`
+  - *Tile Shop*  corresponds with  `shop=tiles`
+  - *Tobacco Shop*  corresponds with  `shop=tobacco`
+  - *Tool Rental*  corresponds with  `shop=tool_hire`
+  - *Toy Store*  corresponds with  `shop=toys`
+  - *Trade Shop*  corresponds with  `shop=trade`
+  - *Travel Agency*  corresponds with  `shop=travel_agency`
+  - *Trophy Shop*  corresponds with  `shop=trophy`
+  - *Tire Store*  corresponds with  `shop=tyres`
+  - *Vacuum Cleaner Store*  corresponds with  `shop=vacuum_cleaner`
+  - *Discount Store*  corresponds with  `shop=variety_store`
+  - *Video Store*  corresponds with  `shop=video`
+  - *Video Game Store*  corresponds with  `shop=video_games`
+  - *Watches Shop*  corresponds with  `shop=watches`
+  - *Drinking Water Shop*  corresponds with  `shop=water`
+  - *Watersport/Swim Shop*  corresponds with  `shop=water_sports`
+  - *Weapon Shop*  corresponds with  `shop=weapons`
+  - *Wholesale Store*  corresponds with  `shop=wholesale`
+  - *Wig Shop*  corresponds with  `shop=wigs`
+  - *Window Blind Store*  corresponds with  `shop=window_blind`
+  - *Wine Shop*  corresponds with  `shop=wine`
+
+
+
+
 ### opening_hours 
 
 
diff --git a/Docs/Layers/sports_centre.md b/Docs/Layers/sports_centre.md
index c77e31cd6..6e59ed727 100644
--- a/Docs/Layers/sports_centre.md
+++ b/Docs/Layers/sports_centre.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/sports_centre/sports_centre.svg' height="100px"> 
+
 
 Indoor and outdoor sports centres can be found on this layer
 
diff --git a/Docs/Layers/street_lamps.md b/Docs/Layers/street_lamps.md
index b1ebb5f35..a70f2fbf9 100644
--- a/Docs/Layers/street_lamps.md
+++ b/Docs/Layers/street_lamps.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/street_lamps/street_lamp.svg' height="100px"> 
+
 
 A layer showing street lights
 
diff --git a/Docs/Layers/streets_without_etymology.md b/Docs/Layers/streets_without_etymology.md
index 16f888945..3daa57592 100644
--- a/Docs/Layers/streets_without_etymology.md
+++ b/Docs/Layers/streets_without_etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/surveillance_camera.md b/Docs/Layers/surveillance_camera.md
index d28122081..02cff62e0 100644
--- a/Docs/Layers/surveillance_camera.md
+++ b/Docs/Layers/surveillance_camera.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/surveillance/logo.svg' height="100px"> 
+
 
 This layer shows surveillance cameras and allows a contributor to update information and add new cameras
 
diff --git a/Docs/Layers/tertiary_education.md b/Docs/Layers/tertiary_education.md
index e35a4aa1c..474a87e29 100644
--- a/Docs/Layers/tertiary_education.md
+++ b/Docs/Layers/tertiary_education.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/school/college.svg' height="100px"> 
+
 
 Layer with all tertiary education institutes (ISCED:2011 levels 6,7 and 8)
 
@@ -49,6 +49,8 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/amenity#values) [amenity](https://wiki.openstreetmap.org/wiki/Key:amenity) | Multiple choice | [college](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcollege) [university](https://wiki.openstreetmap.org/wiki/Tag:amenity%3Duniversity)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/isced:2011:level#values) [isced:2011:level](https://wiki.openstreetmap.org/wiki/Key:isced:2011:level) | Multiple choice | [bachelor](https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Dbachelor) [master](https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Dmaster) [doctorate](https://wiki.openstreetmap.org/wiki/Tag:isced:2011:level%3Ddoctorate)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/capacity#values) [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/school:gender#values) [school:gender](https://wiki.openstreetmap.org/wiki/Key:school:gender) | Multiple choice | [mixed](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dmixed) [separated](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dseparated) [male](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dmale) [female](https://wiki.openstreetmap.org/wiki/Tag:school:gender%3Dfemale)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/email#values) [email](https://wiki.openstreetmap.org/wiki/Key:email) | [email](../SpecialInputElements.md#email) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/phone#values) [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) | 
@@ -110,6 +112,38 @@ This tagrendering is only visible in the popup if the following condition is met
 
 
 
+### capacity 
+
+
+
+The question is  *How much students can at most enroll in this school?*
+
+This rendering asks information about the property  [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) 
+
+This is rendered with  `This school can enroll at most {capacity} students`
+
+
+
+
+
+### gender 
+
+
+
+The question is  *Which genders can enroll at this school?*
+
+
+
+
+
+  - *Both boys and girls can enroll here and have classes together*  corresponds with  `school:gender=mixed`
+  - *Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)*  corresponds with  `school:gender=separated`
+  - *This is a boys only-school*  corresponds with  `school:gender=male`
+  - *This is a girls-only school*  corresponds with  `school:gender=female`
+
+
+
+
 ### website 
 
 
diff --git a/Docs/Layers/ticket_machine.md b/Docs/Layers/ticket_machine.md
index 6c7baebf6..d2d74f392 100644
--- a/Docs/Layers/ticket_machine.md
+++ b/Docs/Layers/ticket_machine.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:lightblue;./assets/themes/stations/public_transport_tickets.svg' height="100px"> 
+
 
 Find ticket machines for public transport tickets
 
diff --git a/Docs/Layers/ticket_validator.md b/Docs/Layers/ticket_validator.md
index 6779a03f5..1f636f438 100644
--- a/Docs/Layers/ticket_validator.md
+++ b/Docs/Layers/ticket_validator.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/square:green;./assets/themes/stations/public_transport_tickets.svg' height="100px"> 
+
 
 Find ticket validators to validate public transport tickets
 
diff --git a/Docs/Layers/toilet.md b/Docs/Layers/toilet.md
index a2a467436..74daf39b6 100644
--- a/Docs/Layers/toilet.md
+++ b/Docs/Layers/toilet.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:#ffffff;./assets/layers/toilet/toilets.svg' height="100px"> 
+
 
 A layer showing (public) toilets
 
diff --git a/Docs/Layers/toilet_at_amenity.md b/Docs/Layers/toilet_at_amenity.md
index 9eff072e7..fc5e3b0cb 100644
--- a/Docs/Layers/toilet_at_amenity.md
+++ b/Docs/Layers/toilet_at_amenity.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/toilet/toilets.svg' height="100px"> 
+
 
 A layer showing (public) toilets located at different places.
 
@@ -54,6 +54,11 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:wheelchair#values) [toilets:wheelchair](https://wiki.openstreetmap.org/wiki/Key:toilets:wheelchair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:wheelchair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:wheelchair%3Dno) [designated](https://wiki.openstreetmap.org/wiki/Tag:toilets:wheelchair%3Ddesignated)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:door:width#values) [toilets:door:width](https://wiki.openstreetmap.org/wiki/Key:toilets:door:width) | [pfloat](../SpecialInputElements.md#pfloat) | 
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:position#values) [toilets:position](https://wiki.openstreetmap.org/wiki/Key:toilets:position) | Multiple choice | [seated](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dseated) [urinal](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Durinal) [squat](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dsquat) [seated;urinal](https://wiki.openstreetmap.org/wiki/Tag:toilets:position%3Dseated;urinal)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/changing_table#values) [changing_table](https://wiki.openstreetmap.org/wiki/Key:changing_table) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:changing_table%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:changing_table%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/changing_table:location#values) [changing_table:location](https://wiki.openstreetmap.org/wiki/Key:changing_table:location) | [string](../SpecialInputElements.md#string) | [female_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dfemale_toilet) [male_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dmale_toilet) [wheelchair_toilet](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Dwheelchair_toilet) [dedicated_room](https://wiki.openstreetmap.org/wiki/Tag:changing_table:location%3Ddedicated_room)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:handwashing#values) [toilets:handwashing](https://wiki.openstreetmap.org/wiki/Key:toilets:handwashing) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:handwashing%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:paper_supplied#values) [toilets:paper_supplied](https://wiki.openstreetmap.org/wiki/Key:toilets:paper_supplied) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:toilets:paper_supplied%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/toilets:description#values) [toilets:description](https://wiki.openstreetmap.org/wiki/Key:toilets:description) | [string](../SpecialInputElements.md#string) | 
 
 
@@ -234,54 +239,104 @@ This tagrendering is only visible in the popup if the following condition is met
 
 
 
-### toilettoiletstype 
+### toilets-type 
 
 
 
-This tagrendering has no question and is thus read-only
+The question is  *Which kind of toilets are this?*
 
 
 
 
 
-### toilettoiletschangingtable 
+  - *There are only seated toilets*  corresponds with  `toilets:position=seated`
+  - *There are only urinals here*  corresponds with  `toilets:position=urinal`
+  - *There are only squat toilets here*  corresponds with  `toilets:position=squat`
+  - *Both seated toilets and urinals are available here*  corresponds with  `toilets:position=seated;urinal`
+
+
+This tagrendering has labels  `relevant-questions`
 
 
 
-This tagrendering has no question and is thus read-only
+### toilets-changing-table 
+
+
+
+The question is  *Is a changing table (to change diapers) available?*
 
 
 
 
 
-### toilettoiletchangingtablelocation 
+  - *A changing table is available*  corresponds with  `changing_table=yes`
+  - *No changing table is available*  corresponds with  `changing_table=no`
+
+
+This tagrendering has labels  `relevant-questions`
 
 
 
-This tagrendering has no question and is thus read-only
+### toilet-changing_table:location 
+
+
+
+The question is  *Where is the changing table located?*
+
+This rendering asks information about the property  [changing_table:location](https://wiki.openstreetmap.org/wiki/Key:changing_table:location) 
+
+This is rendered with  `The changing table is located at {changing_table:location}`
 
 
 
 
 
-### toilettoilethandwashing 
+  - *The changing table is in the toilet for women. *  corresponds with  `changing_table:location=female_toilet`
+  - *The changing table is in the toilet for men. *  corresponds with  `changing_table:location=male_toilet`
+  - *The changing table is in the toilet for wheelchair users. *  corresponds with  `changing_table:location=wheelchair_toilet`
+  - *The changing table is in a dedicated room. *  corresponds with  `changing_table:location=dedicated_room`
+
+
+This tagrendering is only visible in the popup if the following condition is met: `changing_table=yes`
+
+This tagrendering has labels  `relevant-questions`
 
 
 
-This tagrendering has no question and is thus read-only
+### toilet-handwashing 
+
+
+
+The question is  *Do these toilets have a sink to wash your hands?*
 
 
 
 
 
-### toilettoilethaspaper 
+  - *This toilets have a sink to wash your hands*  corresponds with  `toilets:handwashing=yes`
+  - *This toilets <b>don't</b> have a sink to wash your hands*  corresponds with  `toilets:handwashing=no`
+
+
+This tagrendering has labels  `relevant-questions`
 
 
 
-This tagrendering has no question and is thus read-only
+### toilet-has-paper 
 
 
 
+The question is  *Does one have to bring their own toilet paper to this toilet?*
+
+
+
+
+
+  - *This toilet is equipped with toilet paper*  corresponds with  `toilets:paper_supplied=yes`
+  - *You have to bring your own toilet paper to this toilet*  corresponds with  `toilets:paper_supplied=no`
+
+
+This tagrendering has labels  `relevant-questions`
+
 
 
 ### description 
@@ -367,6 +422,13 @@ wheelchair.0 | Wheelchair accessible | toilets:wheelchair=yes\|toilets:wheelchai
 
 
 
+id | question | osmTags
+---- | ---------- | ---------
+changing_table.0 | Has a changing table | changing_table=yes
+
+
+
+
 id | question | osmTags
 ---- | ---------- | ---------
 free.0 | Free to use | toilets:fee=no\|toilets:fee=0\|toilets:charge=0
diff --git a/Docs/Layers/toursistic_places_without_etymology.md b/Docs/Layers/toursistic_places_without_etymology.md
index 5dd7db5c3..e4904dd2d 100644
--- a/Docs/Layers/toursistic_places_without_etymology.md
+++ b/Docs/Layers/toursistic_places_without_etymology.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/pin:#05d7fcaa' height="100px"> 
+
 
 All objects which have an etymology known
 
diff --git a/Docs/Layers/trail.md b/Docs/Layers/trail.md
index 20e6a5a15..cc4f2b23d 100644
--- a/Docs/Layers/trail.md
+++ b/Docs/Layers/trail.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/trail/trail.svg' height="100px"> 
+
 
 Aangeduide wandeltochten
 
diff --git a/Docs/Layers/transit_stops.md b/Docs/Layers/transit_stops.md
index da394aa41..204464803 100644
--- a/Docs/Layers/transit_stops.md
+++ b/Docs/Layers/transit_stops.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/transit_stops/bus_stop.svg' height="100px"> 
+
 
 Layer showing different types of transit stops.
 
diff --git a/Docs/Layers/tree_node.md b/Docs/Layers/tree_node.md
index bee1fa70e..50db16d72 100644
--- a/Docs/Layers/tree_node.md
+++ b/Docs/Layers/tree_node.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:#ffffff;./assets/layers/tree_node/unknown.svg' height="100px"> 
+
 
 A layer showing trees
 
diff --git a/Docs/Layers/vending_machine.md b/Docs/Layers/vending_machine.md
index 3b592ab05..d31dbf0d9 100644
--- a/Docs/Layers/vending_machine.md
+++ b/Docs/Layers/vending_machine.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/vending_machine/vending_machine.svg' height="100px"> 
+
 
 Layer showing vending machines
 
diff --git a/Docs/Layers/veterinary.md b/Docs/Layers/veterinary.md
index 4d76758c1..3730721cd 100644
--- a/Docs/Layers/veterinary.md
+++ b/Docs/Layers/veterinary.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/veterinary/vet.svg' height="100px"> 
+
 
 A layer showing veterinarians
 
diff --git a/Docs/Layers/viewpoint.md b/Docs/Layers/viewpoint.md
index 1c69a1c99..d941c86ff 100644
--- a/Docs/Layers/viewpoint.md
+++ b/Docs/Layers/viewpoint.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/viewpoint/viewpoint.svg' height="100px"> 
+
 
 A nice viewpoint or nice view. Ideal to add an image if no other category fits
 
diff --git a/Docs/Layers/village_green.md b/Docs/Layers/village_green.md
index efcdef4e8..4c5d4d032 100644
--- a/Docs/Layers/village_green.md
+++ b/Docs/Layers/village_green.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/playgrounds/playground.svg' height="100px"> 
+
 
 A layer showing village-green (which are communal green areas, but not quite parks)
 
diff --git a/Docs/Layers/visitor_information_centre.md b/Docs/Layers/visitor_information_centre.md
index 00a30bc2f..7891b9c16 100644
--- a/Docs/Layers/visitor_information_centre.md
+++ b/Docs/Layers/visitor_information_centre.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/layers/visitor_information_centre/information.svg' height="100px"> 
+
 
 A visitor center offers information about a specific attraction or place of interest where it is located.
 
diff --git a/Docs/Layers/waste_basket.md b/Docs/Layers/waste_basket.md
index 479b1e21a..850218826 100644
--- a/Docs/Layers/waste_basket.md
+++ b/Docs/Layers/waste_basket.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/waste_basket/waste_basket.svg' height="100px"> 
+
 
 This is a public waste basket, thrash can, where you can throw away your thrash.
 
diff --git a/Docs/Layers/waste_disposal.md b/Docs/Layers/waste_disposal.md
index 2a9b9697a..9593066b8 100644
--- a/Docs/Layers/waste_disposal.md
+++ b/Docs/Layers/waste_disposal.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/circle:white;./assets/layers/waste_disposal/waste_disposal.svg' height="100px"> 
+
 
 Waste Disposal Bin, medium to large bin for disposal of (household) waste
 
diff --git a/Docs/Layers/windturbine.md b/Docs/Layers/windturbine.md
index db9bfbb47..3d2ccac0f 100644
--- a/Docs/Layers/windturbine.md
+++ b/Docs/Layers/windturbine.md
@@ -5,7 +5,7 @@
 
 
 
-<img src='https://mapcomplete.org/./assets/themes/openwindpowermap/wind_turbine.svg' height="100px"> 
+
 
 Modern windmills generating electricity
 
diff --git a/Docs/Schemas/IconConfigJson.schema.json b/Docs/Schemas/IconConfigJson.schema.json
new file mode 100644
index 000000000..1e79ac4ab
--- /dev/null
+++ b/Docs/Schemas/IconConfigJson.schema.json
@@ -0,0 +1,363 @@
+{
+  "type": "object",
+  "properties": {
+    "icon": {
+      "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "builtin": {
+              "type": "string"
+            },
+            "override": {}
+          },
+          "required": [
+            "builtin",
+            "override"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "color": {
+      "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "builtin": {
+              "type": "string"
+            },
+            "override": {}
+          },
+          "required": [
+            "builtin",
+            "override"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    }
+  },
+  "required": [
+    "icon"
+  ],
+  "definitions": {
+    "TagConfigJson": {
+      "description": "The main representation of Tags.\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for more documentation\n\ntype: tag",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/{and:TagConfigJson[];}"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "or": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/TagConfigJson"
+              }
+            }
+          },
+          "required": [
+            "or"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "{and:TagConfigJson[];}": {
+      "type": "object",
+      "properties": {
+        "and": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TagConfigJson"
+          }
+        }
+      },
+      "required": [
+        "and"
+      ],
+      "additionalProperties": false
+    },
+    "{or:TagConfigJson[];}": {
+      "type": "object",
+      "properties": {
+        "or": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TagConfigJson"
+          }
+        }
+      },
+      "required": [
+        "or"
+      ],
+      "additionalProperties": false
+    },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "DenominationConfigJson": {
+      "type": "object",
+      "properties": {
+        "useIfNoUnitGiven": {
+          "description": "If this evaluates to true and the value to interpret has _no_ unit given, assumes that this unit is meant.\nAlternatively, a list of country codes can be given where this acts as the default interpretation\n\nE.g., a denomination using \"meter\" would probably set this flag to \"true\";\na denomination for \"mp/h\" will use the condition \"_country=gb\" to indicate that it is the default in the UK.\n\nIf none of the units indicate that they are the default, the first denomination will be used instead",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "canonicalDenomination": {
+          "description": "The canonical value for this denomination which will be added to the value in OSM.\ne.g. \"m\" for meters\nIf the user inputs '42', the canonical value will be added and it'll become '42m'.\n\nImportant: often, _no_ canonical values are expected, e.g. in the case of 'maxspeed' where 'km/h' is the default.\nIn this case, an empty string should be used",
+          "type": "string"
+        },
+        "canonicalDenominationSingular": {
+          "description": "The canonical denomination in the case that the unit is precisely '1'.\nUsed for display purposes only.\n\nE.g.: for duration of something in minutes: `2 minutes` but `1 minute`; the `minute` goes here",
+          "type": "string"
+        },
+        "alternativeDenomination": {
+          "description": "A list of alternative values which can occur in the OSM database - used for parsing.\nE.g.: while 'm' is canonical, `meter`, `mtrs`, ... can occur as well",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "human": {
+          "description": "The value for humans in the dropdown. This should not use abbreviations and should be translated, e.g.\n{\n    \"en\": \"meter\",\n    \"fr\": \"metre\"\n}",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "humanSingular": {
+          "description": "The value for humans in the dropdown. This should not use abbreviations and should be translated, e.g.\n{\n    \"en\": \"minute\",\n    \"nl\": \"minuut\"\n}",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "prefix": {
+          "description": "If set, then the canonical value will be prefixed instead, e.g. for '€'\nNote that if all values use 'prefix', the dropdown might move to before the text field",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "canonicalDenomination"
+      ],
+      "additionalProperties": false
+    },
+    "TagRenderingConfigJson": {
+      "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
+      "type": "object",
+      "properties": {
+        "render": {
+          "description": "question: What text should be rendered?\n\nThis piece of text will be shown in the infobox.\nNote that \"&LBRACEkey&RBRACE\"-parts are substituted by the corresponding values of the element.\n\nThis text will be shown if:\n- there is no mapping which matches (or there are no matches)\n- no question, no mappings and no 'freeform' is set\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '&lt;a href='{website}'>{website}&lt;/a>' or include images such as `This is of type A &lt;br>&lt;img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "icon": {
+          "description": "question: what icon should be shown next to the 'render' value?\nAn icon shown next to the rendering; typically shown pretty small\nThis is only shown next to the \"render\" value\nType: icon",
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "path": {
+                  "description": "The path to the icon\nType: icon",
+                  "type": "string"
+                },
+                "class": {
+                  "description": "A hint to mapcomplete on how to render this icon within the mapping.\nThis is translated to 'mapping-icon-<classtype>', so defining your own in combination with a custom CSS is possible (but discouraged)",
+                  "type": "string"
+                }
+              },
+              "required": [
+                "path"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "condition": {
+          "description": "question: When should this item be shown?\n\nOnly show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/{and:TagConfigJson[];}"
+            },
+            {
+              "$ref": "#/definitions/{or:TagConfigJson[];}"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "metacondition": {
+          "description": "question: When should this item be shown (including special conditions)?\n\nIf set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/{and:TagConfigJson[];}"
+            },
+            {
+              "$ref": "#/definitions/{or:TagConfigJson[];}"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "freeform": {
+          "description": "question: Should a freeform text field be shown?\nAllow freeform text input from the user\nifunset: Do not add a freeform text field",
+          "type": "object",
+          "properties": {
+            "key": {
+              "description": "What attribute should be filled out\nIf this key is present in the feature, then 'render' is used to display the value.\nIf this is undefined, the rendering is _always_ shown",
+              "type": "string"
+            }
+          },
+          "required": [
+            "key"
+          ]
+        },
+        "mappings": {
+          "description": "Allows fixed-tag inputs, shown either as radiobuttons or as checkboxes",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "if": {
+                "$ref": "#/definitions/TagConfigJson",
+                "description": "question: When should this single mapping match?\n\nIf this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
+              },
+              "then": {
+                "description": "question: What text should be shown?\n\nIf the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "icon": {
+                "description": "question: What icon should be added to this mapping?\nAn icon supporting this mapping; typically shown pretty small\ninline: <img src='{icon}' class=\"w-8 h-8\" /> {icon}\nType: icon",
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "path": {
+                        "description": "The path to the icon\nType: icon",
+                        "type": "string"
+                      },
+                      "class": {
+                        "description": "A hint to mapcomplete on how to render this icon within the mapping.\nThis is translated to 'mapping-icon-<classtype>', so defining your own in combination with a custom CSS is possible (but discouraged)",
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "path"
+                    ]
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "if",
+              "then"
+            ]
+          }
+        },
+        "description": {
+          "description": "A human-readable text explaining what this tagRendering does.\nMostly used for the shared tagrenderings",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "classes": {
+          "description": "question: What css-classes should be applied to showing this attribute?\n\nA list of css-classes to apply to the entire tagRendering.\nThese classes are applied in 'answer'-mode, not in question mode\nThis is only for advanced users.\n\nValues are split on ` `  (space)",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": false
+}
\ No newline at end of file
diff --git a/Docs/Schemas/IconConfigJsonJSC.ts b/Docs/Schemas/IconConfigJsonJSC.ts
new file mode 100644
index 000000000..d5e9d92a3
--- /dev/null
+++ b/Docs/Schemas/IconConfigJsonJSC.ts
@@ -0,0 +1,356 @@
+export default {
+  "type": "object",
+  "properties": {
+    "icon": {
+      "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "builtin": {
+              "type": "string"
+            },
+            "override": {}
+          },
+          "required": [
+            "builtin",
+            "override"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "color": {
+      "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "builtin": {
+              "type": "string"
+            },
+            "override": {}
+          },
+          "required": [
+            "builtin",
+            "override"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    }
+  },
+  "required": [
+    "icon"
+  ],
+  "definitions": {
+    "TagConfigJson": {
+      "description": "The main representation of Tags.\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for more documentation\n\ntype: tag",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/{and:TagConfigJson[];}"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "or": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/TagConfigJson"
+              }
+            }
+          },
+          "required": [
+            "or"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "{and:TagConfigJson[];}": {
+      "type": "object",
+      "properties": {
+        "and": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TagConfigJson"
+          }
+        }
+      },
+      "required": [
+        "and"
+      ]
+    },
+    "{or:TagConfigJson[];}": {
+      "type": "object",
+      "properties": {
+        "or": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TagConfigJson"
+          }
+        }
+      },
+      "required": [
+        "or"
+      ]
+    },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
+    "DenominationConfigJson": {
+      "type": "object",
+      "properties": {
+        "useIfNoUnitGiven": {
+          "description": "If this evaluates to true and the value to interpret has _no_ unit given, assumes that this unit is meant.\nAlternatively, a list of country codes can be given where this acts as the default interpretation\n\nE.g., a denomination using \"meter\" would probably set this flag to \"true\";\na denomination for \"mp/h\" will use the condition \"_country=gb\" to indicate that it is the default in the UK.\n\nIf none of the units indicate that they are the default, the first denomination will be used instead",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "canonicalDenomination": {
+          "description": "The canonical value for this denomination which will be added to the value in OSM.\ne.g. \"m\" for meters\nIf the user inputs '42', the canonical value will be added and it'll become '42m'.\n\nImportant: often, _no_ canonical values are expected, e.g. in the case of 'maxspeed' where 'km/h' is the default.\nIn this case, an empty string should be used",
+          "type": "string"
+        },
+        "canonicalDenominationSingular": {
+          "description": "The canonical denomination in the case that the unit is precisely '1'.\nUsed for display purposes only.\n\nE.g.: for duration of something in minutes: `2 minutes` but `1 minute`; the `minute` goes here",
+          "type": "string"
+        },
+        "alternativeDenomination": {
+          "description": "A list of alternative values which can occur in the OSM database - used for parsing.\nE.g.: while 'm' is canonical, `meter`, `mtrs`, ... can occur as well",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "human": {
+          "description": "The value for humans in the dropdown. This should not use abbreviations and should be translated, e.g.\n{\n    \"en\": \"meter\",\n    \"fr\": \"metre\"\n}",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "humanSingular": {
+          "description": "The value for humans in the dropdown. This should not use abbreviations and should be translated, e.g.\n{\n    \"en\": \"minute\",\n    \"nl\": \"minuut\"\n}",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "prefix": {
+          "description": "If set, then the canonical value will be prefixed instead, e.g. for '€'\nNote that if all values use 'prefix', the dropdown might move to before the text field",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "canonicalDenomination"
+      ]
+    },
+    "TagRenderingConfigJson": {
+      "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
+      "type": "object",
+      "properties": {
+        "render": {
+          "description": "question: What text should be rendered?\n\nThis piece of text will be shown in the infobox.\nNote that \"&LBRACEkey&RBRACE\"-parts are substituted by the corresponding values of the element.\n\nThis text will be shown if:\n- there is no mapping which matches (or there are no matches)\n- no question, no mappings and no 'freeform' is set\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '&lt;a href='{website}'>{website}&lt;/a>' or include images such as `This is of type A &lt;br>&lt;img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "icon": {
+          "description": "question: what icon should be shown next to the 'render' value?\nAn icon shown next to the rendering; typically shown pretty small\nThis is only shown next to the \"render\" value\nType: icon",
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "path": {
+                  "description": "The path to the icon\nType: icon",
+                  "type": "string"
+                },
+                "class": {
+                  "description": "A hint to mapcomplete on how to render this icon within the mapping.\nThis is translated to 'mapping-icon-<classtype>', so defining your own in combination with a custom CSS is possible (but discouraged)",
+                  "type": "string"
+                }
+              },
+              "required": [
+                "path"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "condition": {
+          "description": "question: When should this item be shown?\n\nOnly show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/{and:TagConfigJson[];}"
+            },
+            {
+              "$ref": "#/definitions/{or:TagConfigJson[];}"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "metacondition": {
+          "description": "question: When should this item be shown (including special conditions)?\n\nIf set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/{and:TagConfigJson[];}"
+            },
+            {
+              "$ref": "#/definitions/{or:TagConfigJson[];}"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "freeform": {
+          "description": "question: Should a freeform text field be shown?\nAllow freeform text input from the user\nifunset: Do not add a freeform text field",
+          "type": "object",
+          "properties": {
+            "key": {
+              "description": "What attribute should be filled out\nIf this key is present in the feature, then 'render' is used to display the value.\nIf this is undefined, the rendering is _always_ shown",
+              "type": "string"
+            }
+          },
+          "required": [
+            "key"
+          ]
+        },
+        "mappings": {
+          "description": "Allows fixed-tag inputs, shown either as radiobuttons or as checkboxes",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "if": {
+                "$ref": "#/definitions/TagConfigJson",
+                "description": "question: When should this single mapping match?\n\nIf this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
+              },
+              "then": {
+                "description": "question: What text should be shown?\n\nIf the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "icon": {
+                "description": "question: What icon should be added to this mapping?\nAn icon supporting this mapping; typically shown pretty small\ninline: <img src='{icon}' class=\"w-8 h-8\" /> {icon}\nType: icon",
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "path": {
+                        "description": "The path to the icon\nType: icon",
+                        "type": "string"
+                      },
+                      "class": {
+                        "description": "A hint to mapcomplete on how to render this icon within the mapping.\nThis is translated to 'mapping-icon-<classtype>', so defining your own in combination with a custom CSS is possible (but discouraged)",
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "path"
+                    ]
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "if",
+              "then"
+            ]
+          }
+        },
+        "description": {
+          "description": "A human-readable text explaining what this tagRendering does.\nMostly used for the shared tagrenderings",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "classes": {
+          "description": "question: What css-classes should be applied to showing this attribute?\n\nA list of css-classes to apply to the entire tagRendering.\nThese classes are applied in 'answer'-mode, not in question mode\nThis is only for advanced users.\n\nValues are split on ` `  (space)",
+          "type": "string"
+        }
+      }
+    }
+  },
+  "$schema": "http://json-schema.org/draft-07/schema#"
+}
\ No newline at end of file
diff --git a/Docs/Schemas/LayerConfigJson.schema.json b/Docs/Schemas/LayerConfigJson.schema.json
index 15e718bcc..4faf2bf8c 100644
--- a/Docs/Schemas/LayerConfigJson.schema.json
+++ b/Docs/Schemas/LayerConfigJson.schema.json
@@ -118,7 +118,7 @@
       "type": "number"
     },
     "title": {
-      "description": "The title shown in a popup for elements of this layer.\n\ngroup: title\nquestion: What title should be shown on the infobox?\ntypes: use a fixed translation ; Use a dynamic tagRendering ; use a fixed string for all languages\ntypesdefault: 1",
+      "description": "question: What title should be shown on the infobox?\nThe title shown in a popup for elements of this layer.\n\ngroup: title\ntypes: use a fixed translation ; Use a dynamic tagRendering ; hidden\ntypesdefault: 1\ntype: translation",
       "anyOf": [
         {
           "$ref": "#/definitions/Record<string,string>"
@@ -701,6 +701,63 @@
       },
       "additionalProperties": false
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ],
+      "additionalProperties": false
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
@@ -862,35 +919,10 @@
           }
         },
         "marker": {
-          "description": "question: What marker should be used to\nThe icon for an element.\nNote that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets.\n\nThe result of the icon is rendered as follows:\nthe resulting string is interpreted as a _list_ of items, separated by \";\". The bottommost layer is the first layer.\nAs a result, on could use a generic pin, then overlay it with a specific icon.\nTo make things even more practical, one c    an use all SVG's from the folder \"assets/svg\" and _substitute the color_ in it.\nE.g. to draw a red pin, use \"pin:#f00\", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>`\n\nType: icon",
+          "description": "The marker for an element.\nNote that this also defines the icon for this layer (rendered with the overpass-tags) <i>and</i> the icon in the presets.\n\nThe result of the icon is rendered as follows:\n- The first icon is rendered on the map\n- The second entry is overlayed on top of it\n- ...\n\nAs a result, on could use a generic icon (`pin`, `circle`, `square`) with a color, then overlay it with a specific icon.",
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "icon": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              },
-              "color": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              }
-            },
-            "required": [
-              "icon"
-            ]
+            "$ref": "#/definitions/IconConfigJson"
           }
         },
         "iconBadges": {
@@ -922,7 +954,7 @@
           }
         },
         "iconSize": {
-          "description": "A string containing \"width,height\" or \"width,height,anchorpoint\" where anchorpoint is any of 'center', 'top', 'bottom', 'left', 'right', 'bottomleft','topright', ...\nDefault is '40,40,center'",
+          "description": "question: What size should the marker be on the map?\nA string containing \"<width>,<height>\" in pixels\nifunset: Use the default size (<b>40,40</b> px)",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -944,7 +976,7 @@
           ]
         },
         "rotation": {
-          "description": "The rotation of an icon, useful for e.g. directions.\nUsage: as if it were a css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``",
+          "description": "question: What rotation should be applied on the icon?\nThis is mostly useful for items that face a specific direction, such as surveillance cameras\nThis is interpreted as css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``\nifunset: Do not rotate",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -955,7 +987,7 @@
           ]
         },
         "label": {
-          "description": "question: What label should be shown beneath the marker?\nFor example: <div style=\"background: white\">{name}</div>\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
+          "description": "question: What label should be shown beneath the marker?\nFor example: `&LT;div style=\"background: white\">{name}&LT;/div>`\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -1010,7 +1042,7 @@
           ]
         },
         "pitchAlignment": {
-          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "description": "question: If the map is pitched, should the icon stay parallel to the screen or to the groundplane?\nsuggestions: return [{if: \"value=canvas\", then: \"The icon will stay upward and not be transformed as if it sticks to the screen\"}, {if: \"value=map\", then: \"The icon will be transformed as if it were painted onto the ground. (Automatically sets rotationAlignment)\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -1025,7 +1057,7 @@
           ]
         },
         "rotationAlignment": {
-          "description": "question: Should the icon be rotated or tilted if the map is rotated or tilted?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"If the map is tilted, tilt the icon as well. This gives the impression of an icon that is glued to the ground.\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
+          "description": "question: Should the icon be rotated if the map is rotated?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"Never rotate the icon\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
diff --git a/Docs/Schemas/LayerConfigJsonJSC.ts b/Docs/Schemas/LayerConfigJsonJSC.ts
index 3fd828770..826040f79 100644
--- a/Docs/Schemas/LayerConfigJsonJSC.ts
+++ b/Docs/Schemas/LayerConfigJsonJSC.ts
@@ -118,7 +118,7 @@ export default {
       "type": "number"
     },
     "title": {
-      "description": "The title shown in a popup for elements of this layer.\n\ngroup: title\nquestion: What title should be shown on the infobox?\ntypes: use a fixed translation ; Use a dynamic tagRendering ; use a fixed string for all languages\ntypesdefault: 1",
+      "description": "question: What title should be shown on the infobox?\nThe title shown in a popup for elements of this layer.\n\ngroup: title\ntypes: use a fixed translation ; Use a dynamic tagRendering ; hidden\ntypesdefault: 1\ntype: translation",
       "anyOf": [
         {
           "$ref": "#/definitions/Record<string,string>"
@@ -695,6 +695,62 @@ export default {
         }
       }
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ]
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
@@ -852,35 +908,10 @@ export default {
           }
         },
         "marker": {
-          "description": "question: What marker should be used to\nThe icon for an element.\nNote that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets.\n\nThe result of the icon is rendered as follows:\nthe resulting string is interpreted as a _list_ of items, separated by \";\". The bottommost layer is the first layer.\nAs a result, on could use a generic pin, then overlay it with a specific icon.\nTo make things even more practical, one c    an use all SVG's from the folder \"assets/svg\" and _substitute the color_ in it.\nE.g. to draw a red pin, use \"pin:#f00\", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>`\n\nType: icon",
+          "description": "The marker for an element.\nNote that this also defines the icon for this layer (rendered with the overpass-tags) <i>and</i> the icon in the presets.\n\nThe result of the icon is rendered as follows:\n- The first icon is rendered on the map\n- The second entry is overlayed on top of it\n- ...\n\nAs a result, on could use a generic icon (`pin`, `circle`, `square`) with a color, then overlay it with a specific icon.",
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "icon": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              },
-              "color": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              }
-            },
-            "required": [
-              "icon"
-            ]
+            "$ref": "#/definitions/IconConfigJson"
           }
         },
         "iconBadges": {
@@ -912,7 +943,7 @@ export default {
           }
         },
         "iconSize": {
-          "description": "A string containing \"width,height\" or \"width,height,anchorpoint\" where anchorpoint is any of 'center', 'top', 'bottom', 'left', 'right', 'bottomleft','topright', ...\nDefault is '40,40,center'",
+          "description": "question: What size should the marker be on the map?\nA string containing \"<width>,<height>\" in pixels\nifunset: Use the default size (<b>40,40</b> px)",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -934,7 +965,7 @@ export default {
           ]
         },
         "rotation": {
-          "description": "The rotation of an icon, useful for e.g. directions.\nUsage: as if it were a css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``",
+          "description": "question: What rotation should be applied on the icon?\nThis is mostly useful for items that face a specific direction, such as surveillance cameras\nThis is interpreted as css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``\nifunset: Do not rotate",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -945,7 +976,7 @@ export default {
           ]
         },
         "label": {
-          "description": "question: What label should be shown beneath the marker?\nFor example: <div style=\"background: white\">{name}</div>\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
+          "description": "question: What label should be shown beneath the marker?\nFor example: `&LT;div style=\"background: white\">{name}&LT;/div>`\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -1000,7 +1031,7 @@ export default {
           ]
         },
         "pitchAlignment": {
-          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "description": "question: If the map is pitched, should the icon stay parallel to the screen or to the groundplane?\nsuggestions: return [{if: \"value=canvas\", then: \"The icon will stay upward and not be transformed as if it sticks to the screen\"}, {if: \"value=map\", then: \"The icon will be transformed as if it were painted onto the ground. (Automatically sets rotationAlignment)\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -1015,7 +1046,7 @@ export default {
           ]
         },
         "rotationAlignment": {
-          "description": "question: Should the icon be rotated or tilted if the map is rotated or tilted?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"If the map is tilted, tilt the icon as well. This gives the impression of an icon that is glued to the ground.\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
+          "description": "question: Should the icon be rotated if the map is rotated?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"Never rotate the icon\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
diff --git a/Docs/Schemas/LayoutConfigJson.schema.json b/Docs/Schemas/LayoutConfigJson.schema.json
index a186d319a..171fefe4d 100644
--- a/Docs/Schemas/LayoutConfigJson.schema.json
+++ b/Docs/Schemas/LayoutConfigJson.schema.json
@@ -608,6 +608,63 @@
       },
       "additionalProperties": false
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ],
+      "additionalProperties": false
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
@@ -769,35 +826,10 @@
           }
         },
         "marker": {
-          "description": "question: What marker should be used to\nThe icon for an element.\nNote that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets.\n\nThe result of the icon is rendered as follows:\nthe resulting string is interpreted as a _list_ of items, separated by \";\". The bottommost layer is the first layer.\nAs a result, on could use a generic pin, then overlay it with a specific icon.\nTo make things even more practical, one c    an use all SVG's from the folder \"assets/svg\" and _substitute the color_ in it.\nE.g. to draw a red pin, use \"pin:#f00\", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>`\n\nType: icon",
+          "description": "The marker for an element.\nNote that this also defines the icon for this layer (rendered with the overpass-tags) <i>and</i> the icon in the presets.\n\nThe result of the icon is rendered as follows:\n- The first icon is rendered on the map\n- The second entry is overlayed on top of it\n- ...\n\nAs a result, on could use a generic icon (`pin`, `circle`, `square`) with a color, then overlay it with a specific icon.",
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "icon": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              },
-              "color": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              }
-            },
-            "required": [
-              "icon"
-            ]
+            "$ref": "#/definitions/IconConfigJson"
           }
         },
         "iconBadges": {
@@ -829,7 +861,7 @@
           }
         },
         "iconSize": {
-          "description": "A string containing \"width,height\" or \"width,height,anchorpoint\" where anchorpoint is any of 'center', 'top', 'bottom', 'left', 'right', 'bottomleft','topright', ...\nDefault is '40,40,center'",
+          "description": "question: What size should the marker be on the map?\nA string containing \"<width>,<height>\" in pixels\nifunset: Use the default size (<b>40,40</b> px)",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -851,7 +883,7 @@
           ]
         },
         "rotation": {
-          "description": "The rotation of an icon, useful for e.g. directions.\nUsage: as if it were a css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``",
+          "description": "question: What rotation should be applied on the icon?\nThis is mostly useful for items that face a specific direction, such as surveillance cameras\nThis is interpreted as css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``\nifunset: Do not rotate",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -862,7 +894,7 @@
           ]
         },
         "label": {
-          "description": "question: What label should be shown beneath the marker?\nFor example: <div style=\"background: white\">{name}</div>\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
+          "description": "question: What label should be shown beneath the marker?\nFor example: `&LT;div style=\"background: white\">{name}&LT;/div>`\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -917,7 +949,7 @@
           ]
         },
         "pitchAlignment": {
-          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "description": "question: If the map is pitched, should the icon stay parallel to the screen or to the groundplane?\nsuggestions: return [{if: \"value=canvas\", then: \"The icon will stay upward and not be transformed as if it sticks to the screen\"}, {if: \"value=map\", then: \"The icon will be transformed as if it were painted onto the ground. (Automatically sets rotationAlignment)\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -932,7 +964,7 @@
           ]
         },
         "rotationAlignment": {
-          "description": "question: Should the icon be rotated or tilted if the map is rotated or tilted?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"If the map is tilted, tilt the icon as well. This gives the impression of an icon that is glued to the ground.\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
+          "description": "question: Should the icon be rotated if the map is rotated?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"Never rotate the icon\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -1840,7 +1872,7 @@
           "type": "number"
         },
         "title": {
-          "description": "The title shown in a popup for elements of this layer.\n\ngroup: title\nquestion: What title should be shown on the infobox?\ntypes: use a fixed translation ; Use a dynamic tagRendering ; use a fixed string for all languages\ntypesdefault: 1",
+          "description": "question: What title should be shown on the infobox?\nThe title shown in a popup for elements of this layer.\n\ngroup: title\ntypes: use a fixed translation ; Use a dynamic tagRendering ; hidden\ntypesdefault: 1\ntype: translation",
           "anyOf": [
             {
               "$ref": "#/definitions/Record<string,string>"
@@ -2240,7 +2272,7 @@
           "type": "number"
         },
         "title": {
-          "description": "The title shown in a popup for elements of this layer.\n\ngroup: title\nquestion: What title should be shown on the infobox?\ntypes: use a fixed translation ; Use a dynamic tagRendering ; use a fixed string for all languages\ntypesdefault: 1",
+          "description": "question: What title should be shown on the infobox?\nThe title shown in a popup for elements of this layer.\n\ngroup: title\ntypes: use a fixed translation ; Use a dynamic tagRendering ; hidden\ntypesdefault: 1\ntype: translation",
           "anyOf": [
             {
               "$ref": "#/definitions/Record<string,string>"
diff --git a/Docs/Schemas/LayoutConfigJsonJSC.ts b/Docs/Schemas/LayoutConfigJsonJSC.ts
index 860111d43..a744cd974 100644
--- a/Docs/Schemas/LayoutConfigJsonJSC.ts
+++ b/Docs/Schemas/LayoutConfigJsonJSC.ts
@@ -602,6 +602,62 @@ export default {
         }
       }
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ]
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
@@ -759,35 +815,10 @@ export default {
           }
         },
         "marker": {
-          "description": "question: What marker should be used to\nThe icon for an element.\nNote that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets.\n\nThe result of the icon is rendered as follows:\nthe resulting string is interpreted as a _list_ of items, separated by \";\". The bottommost layer is the first layer.\nAs a result, on could use a generic pin, then overlay it with a specific icon.\nTo make things even more practical, one c    an use all SVG's from the folder \"assets/svg\" and _substitute the color_ in it.\nE.g. to draw a red pin, use \"pin:#f00\", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>`\n\nType: icon",
+          "description": "The marker for an element.\nNote that this also defines the icon for this layer (rendered with the overpass-tags) <i>and</i> the icon in the presets.\n\nThe result of the icon is rendered as follows:\n- The first icon is rendered on the map\n- The second entry is overlayed on top of it\n- ...\n\nAs a result, on could use a generic icon (`pin`, `circle`, `square`) with a color, then overlay it with a specific icon.",
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "icon": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              },
-              "color": {
-                "anyOf": [
-                  {
-                    "$ref": "#/definitions/TagRenderingConfigJson"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ]
-              }
-            },
-            "required": [
-              "icon"
-            ]
+            "$ref": "#/definitions/IconConfigJson"
           }
         },
         "iconBadges": {
@@ -819,7 +850,7 @@ export default {
           }
         },
         "iconSize": {
-          "description": "A string containing \"width,height\" or \"width,height,anchorpoint\" where anchorpoint is any of 'center', 'top', 'bottom', 'left', 'right', 'bottomleft','topright', ...\nDefault is '40,40,center'",
+          "description": "question: What size should the marker be on the map?\nA string containing \"<width>,<height>\" in pixels\nifunset: Use the default size (<b>40,40</b> px)",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -841,7 +872,7 @@ export default {
           ]
         },
         "rotation": {
-          "description": "The rotation of an icon, useful for e.g. directions.\nUsage: as if it were a css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``",
+          "description": "question: What rotation should be applied on the icon?\nThis is mostly useful for items that face a specific direction, such as surveillance cameras\nThis is interpreted as css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``\nifunset: Do not rotate",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -852,7 +883,7 @@ export default {
           ]
         },
         "label": {
-          "description": "question: What label should be shown beneath the marker?\nFor example: <div style=\"background: white\">{name}</div>\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
+          "description": "question: What label should be shown beneath the marker?\nFor example: `&LT;div style=\"background: white\">{name}&LT;/div>`\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -907,7 +938,7 @@ export default {
           ]
         },
         "pitchAlignment": {
-          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "description": "question: If the map is pitched, should the icon stay parallel to the screen or to the groundplane?\nsuggestions: return [{if: \"value=canvas\", then: \"The icon will stay upward and not be transformed as if it sticks to the screen\"}, {if: \"value=map\", then: \"The icon will be transformed as if it were painted onto the ground. (Automatically sets rotationAlignment)\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -922,7 +953,7 @@ export default {
           ]
         },
         "rotationAlignment": {
-          "description": "question: Should the icon be rotated or tilted if the map is rotated or tilted?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"If the map is tilted, tilt the icon as well. This gives the impression of an icon that is glued to the ground.\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
+          "description": "question: Should the icon be rotated if the map is rotated?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"Never rotate the icon\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -1819,7 +1850,7 @@ export default {
           "type": "number"
         },
         "title": {
-          "description": "The title shown in a popup for elements of this layer.\n\ngroup: title\nquestion: What title should be shown on the infobox?\ntypes: use a fixed translation ; Use a dynamic tagRendering ; use a fixed string for all languages\ntypesdefault: 1",
+          "description": "question: What title should be shown on the infobox?\nThe title shown in a popup for elements of this layer.\n\ngroup: title\ntypes: use a fixed translation ; Use a dynamic tagRendering ; hidden\ntypesdefault: 1\ntype: translation",
           "anyOf": [
             {
               "$ref": "#/definitions/Record<string,string>"
@@ -2218,7 +2249,7 @@ export default {
           "type": "number"
         },
         "title": {
-          "description": "The title shown in a popup for elements of this layer.\n\ngroup: title\nquestion: What title should be shown on the infobox?\ntypes: use a fixed translation ; Use a dynamic tagRendering ; use a fixed string for all languages\ntypesdefault: 1",
+          "description": "question: What title should be shown on the infobox?\nThe title shown in a popup for elements of this layer.\n\ngroup: title\ntypes: use a fixed translation ; Use a dynamic tagRendering ; hidden\ntypesdefault: 1\ntype: translation",
           "anyOf": [
             {
               "$ref": "#/definitions/Record<string,string>"
diff --git a/Docs/Schemas/LineRenderingConfigJson.schema.json b/Docs/Schemas/LineRenderingConfigJson.schema.json
index c823b8e7d..fbab6992e 100644
--- a/Docs/Schemas/LineRenderingConfigJson.schema.json
+++ b/Docs/Schemas/LineRenderingConfigJson.schema.json
@@ -369,6 +369,63 @@
       },
       "additionalProperties": false
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ],
+      "additionalProperties": false
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/Schemas/LineRenderingConfigJsonJSC.ts b/Docs/Schemas/LineRenderingConfigJsonJSC.ts
index 4f619c719..21c18c149 100644
--- a/Docs/Schemas/LineRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/LineRenderingConfigJsonJSC.ts
@@ -363,6 +363,62 @@ export default {
         }
       }
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ]
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/Schemas/MappingConfigJson.schema.json b/Docs/Schemas/MappingConfigJson.schema.json
index 27ee75a98..0781d47c2 100644
--- a/Docs/Schemas/MappingConfigJson.schema.json
+++ b/Docs/Schemas/MappingConfigJson.schema.json
@@ -409,6 +409,63 @@
       },
       "additionalProperties": false
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ],
+      "additionalProperties": false
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/Schemas/MappingConfigJsonJSC.ts b/Docs/Schemas/MappingConfigJsonJSC.ts
index 8d4693077..29bac4127 100644
--- a/Docs/Schemas/MappingConfigJsonJSC.ts
+++ b/Docs/Schemas/MappingConfigJsonJSC.ts
@@ -403,6 +403,62 @@ export default {
         }
       }
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ]
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/Schemas/PointRenderingConfigJson.schema.json b/Docs/Schemas/PointRenderingConfigJson.schema.json
index 5965aa60a..7e9c1f78c 100644
--- a/Docs/Schemas/PointRenderingConfigJson.schema.json
+++ b/Docs/Schemas/PointRenderingConfigJson.schema.json
@@ -10,35 +10,10 @@
       }
     },
     "marker": {
-      "description": "question: What marker should be used to\nThe icon for an element.\nNote that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets.\n\nThe result of the icon is rendered as follows:\nthe resulting string is interpreted as a _list_ of items, separated by \";\". The bottommost layer is the first layer.\nAs a result, on could use a generic pin, then overlay it with a specific icon.\nTo make things even more practical, one c    an use all SVG's from the folder \"assets/svg\" and _substitute the color_ in it.\nE.g. to draw a red pin, use \"pin:#f00\", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>`\n\nType: icon",
+      "description": "The marker for an element.\nNote that this also defines the icon for this layer (rendered with the overpass-tags) <i>and</i> the icon in the presets.\n\nThe result of the icon is rendered as follows:\n- The first icon is rendered on the map\n- The second entry is overlayed on top of it\n- ...\n\nAs a result, on could use a generic icon (`pin`, `circle`, `square`) with a color, then overlay it with a specific icon.",
       "type": "array",
       "items": {
-        "type": "object",
-        "properties": {
-          "icon": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/TagRenderingConfigJson"
-              },
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "color": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/TagRenderingConfigJson"
-              },
-              {
-                "type": "string"
-              }
-            ]
-          }
-        },
-        "required": [
-          "icon"
-        ]
+        "$ref": "#/definitions/IconConfigJson"
       }
     },
     "iconBadges": {
@@ -70,7 +45,7 @@
       }
     },
     "iconSize": {
-      "description": "A string containing \"width,height\" or \"width,height,anchorpoint\" where anchorpoint is any of 'center', 'top', 'bottom', 'left', 'right', 'bottomleft','topright', ...\nDefault is '40,40,center'",
+      "description": "question: What size should the marker be on the map?\nA string containing \"<width>,<height>\" in pixels\nifunset: Use the default size (<b>40,40</b> px)",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -92,7 +67,7 @@
       ]
     },
     "rotation": {
-      "description": "The rotation of an icon, useful for e.g. directions.\nUsage: as if it were a css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``",
+      "description": "question: What rotation should be applied on the icon?\nThis is mostly useful for items that face a specific direction, such as surveillance cameras\nThis is interpreted as css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``\nifunset: Do not rotate",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -103,7 +78,7 @@
       ]
     },
     "label": {
-      "description": "question: What label should be shown beneath the marker?\nFor example: <div style=\"background: white\">{name}</div>\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
+      "description": "question: What label should be shown beneath the marker?\nFor example: `&LT;div style=\"background: white\">{name}&LT;/div>`\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -158,7 +133,7 @@
       ]
     },
     "pitchAlignment": {
-      "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+      "description": "question: If the map is pitched, should the icon stay parallel to the screen or to the groundplane?\nsuggestions: return [{if: \"value=canvas\", then: \"The icon will stay upward and not be transformed as if it sticks to the screen\"}, {if: \"value=map\", then: \"The icon will be transformed as if it were painted onto the ground. (Automatically sets rotationAlignment)\"}]",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -173,7 +148,7 @@
       ]
     },
     "rotationAlignment": {
-      "description": "question: Should the icon be rotated or tilted if the map is rotated or tilted?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"If the map is tilted, tilt the icon as well. This gives the impression of an icon that is glued to the ground.\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
+      "description": "question: Should the icon be rotated if the map is rotated?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"Never rotate the icon\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -494,6 +469,63 @@
         }
       },
       "additionalProperties": false
+    },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ],
+      "additionalProperties": false
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/Docs/Schemas/PointRenderingConfigJsonJSC.ts b/Docs/Schemas/PointRenderingConfigJsonJSC.ts
index 85ff65a9c..ce3053790 100644
--- a/Docs/Schemas/PointRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/PointRenderingConfigJsonJSC.ts
@@ -10,35 +10,10 @@ export default {
       }
     },
     "marker": {
-      "description": "question: What marker should be used to\nThe icon for an element.\nNote that this also doubles as the icon for this layer (rendered with the overpass-tags) ánd the icon in the presets.\n\nThe result of the icon is rendered as follows:\nthe resulting string is interpreted as a _list_ of items, separated by \";\". The bottommost layer is the first layer.\nAs a result, on could use a generic pin, then overlay it with a specific icon.\nTo make things even more practical, one c    an use all SVG's from the folder \"assets/svg\" and _substitute the color_ in it.\nE.g. to draw a red pin, use \"pin:#f00\", to have a green circle with your icon on top, use `circle:#0f0;<path to my icon.svg>`\n\nType: icon",
+      "description": "The marker for an element.\nNote that this also defines the icon for this layer (rendered with the overpass-tags) <i>and</i> the icon in the presets.\n\nThe result of the icon is rendered as follows:\n- The first icon is rendered on the map\n- The second entry is overlayed on top of it\n- ...\n\nAs a result, on could use a generic icon (`pin`, `circle`, `square`) with a color, then overlay it with a specific icon.",
       "type": "array",
       "items": {
-        "type": "object",
-        "properties": {
-          "icon": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/TagRenderingConfigJson"
-              },
-              {
-                "type": "string"
-              }
-            ]
-          },
-          "color": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/TagRenderingConfigJson"
-              },
-              {
-                "type": "string"
-              }
-            ]
-          }
-        },
-        "required": [
-          "icon"
-        ]
+        "$ref": "#/definitions/IconConfigJson"
       }
     },
     "iconBadges": {
@@ -70,7 +45,7 @@ export default {
       }
     },
     "iconSize": {
-      "description": "A string containing \"width,height\" or \"width,height,anchorpoint\" where anchorpoint is any of 'center', 'top', 'bottom', 'left', 'right', 'bottomleft','topright', ...\nDefault is '40,40,center'",
+      "description": "question: What size should the marker be on the map?\nA string containing \"<width>,<height>\" in pixels\nifunset: Use the default size (<b>40,40</b> px)",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -92,7 +67,7 @@ export default {
       ]
     },
     "rotation": {
-      "description": "The rotation of an icon, useful for e.g. directions.\nUsage: as if it were a css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``",
+      "description": "question: What rotation should be applied on the icon?\nThis is mostly useful for items that face a specific direction, such as surveillance cameras\nThis is interpreted as css property for 'rotate', thus has to end with 'deg', e.g. `90deg`, `{direction}deg`, `calc(90deg - {camera:direction}deg)``\nifunset: Do not rotate",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -103,7 +78,7 @@ export default {
       ]
     },
     "label": {
-      "description": "question: What label should be shown beneath the marker?\nFor example: <div style=\"background: white\">{name}</div>\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
+      "description": "question: What label should be shown beneath the marker?\nFor example: `&LT;div style=\"background: white\">{name}&LT;/div>`\n\nIf the icon is undefined, then the label is shown in the center of the feature.\ntypes: Dynamic value | string\ninline: Always show label <b>{value}</b> beneath the marker",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -158,7 +133,7 @@ export default {
       ]
     },
     "pitchAlignment": {
-      "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+      "description": "question: If the map is pitched, should the icon stay parallel to the screen or to the groundplane?\nsuggestions: return [{if: \"value=canvas\", then: \"The icon will stay upward and not be transformed as if it sticks to the screen\"}, {if: \"value=map\", then: \"The icon will be transformed as if it were painted onto the ground. (Automatically sets rotationAlignment)\"}]",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -173,7 +148,7 @@ export default {
       ]
     },
     "rotationAlignment": {
-      "description": "question: Should the icon be rotated or tilted if the map is rotated or tilted?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"If the map is tilted, tilt the icon as well. This gives the impression of an icon that is glued to the ground.\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
+      "description": "question: Should the icon be rotated if the map is rotated?\nifunset: Do not rotate or tilt icons. Always keep the icons straight\nsuggestions: return [{if: \"value=canvas\", then: \"Never rotate the icon\"}, {if: \"value=map\", then: \"If the map is rotated, rotate the icon as well. This gives the impression of an icon that floats perpendicular above the ground.\"}]",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -488,6 +463,62 @@ export default {
           "type": "string"
         }
       }
+    },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ]
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"
diff --git a/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json b/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
index c48c5d130..2911cbcde 100644
--- a/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
@@ -497,6 +497,63 @@
       },
       "additionalProperties": false
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ],
+      "additionalProperties": false
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts b/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
index fb48f239d..5cbc88921 100644
--- a/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
@@ -491,6 +491,62 @@ export default {
         }
       }
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ]
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/Schemas/RewritableConfigJson.schema.json b/Docs/Schemas/RewritableConfigJson.schema.json
index dd35dce64..f9e669065 100644
--- a/Docs/Schemas/RewritableConfigJson.schema.json
+++ b/Docs/Schemas/RewritableConfigJson.schema.json
@@ -336,6 +336,63 @@
       },
       "additionalProperties": false
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ],
+      "additionalProperties": false
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/Schemas/RewritableConfigJsonJSC.ts b/Docs/Schemas/RewritableConfigJsonJSC.ts
index 2d326ebb9..c7a20d6a4 100644
--- a/Docs/Schemas/RewritableConfigJsonJSC.ts
+++ b/Docs/Schemas/RewritableConfigJsonJSC.ts
@@ -330,6 +330,62 @@ export default {
         }
       }
     },
+    "IconConfigJson": {
+      "type": "object",
+      "properties": {
+        "icon": {
+          "description": "question: What icon should be used?\ntype: icon\nsuggestions: return [\"pin\",\"square\",\"circle\",\"checkmark\",\"clock\",\"close\",\"crosshair\",\"help\",\"home\",\"invalid\",\"location\",\"location_empty\",\"location_locked\",\"note\",\"resolved\",\"ring\",\"scissors\",\"teardrop\",\"teardrop_with_hole_green\",\"triangle\"].map(i => ({if: \"value=\"+i, then: i, icon: i}))",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "color": {
+          "description": "question: What colour should the icon be?\nThis will only work for the default icons such as `pin`,`circle`,...\ntype: color",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "builtin": {
+                  "type": "string"
+                },
+                "override": {}
+              },
+              "required": [
+                "builtin",
+                "override"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
+        }
+      },
+      "required": [
+        "icon"
+      ]
+    },
     "MinimalTagRenderingConfigJson": {
       "description": "Mostly used for lineRendering and pointRendering",
       "type": "object",
diff --git a/Docs/SpecialInputElements.md b/Docs/SpecialInputElements.md
index acea51bcd..b03f44899 100644
--- a/Docs/SpecialInputElements.md
+++ b/Docs/SpecialInputElements.md
@@ -31,6 +31,7 @@
     + [translation](#translation)
     + [icon](#icon)
     + [fediverse](#fediverse)
+    + [id](#id)
 
 
 
@@ -320,6 +321,14 @@ Makes sure that a valid .svg-path is added
 
 
 
-Validates fediverse addresses and normalizes them into `@username@server`-format 
+Validates fediverse addresses and normalizes them into `@username@server`-format
+
+
+
+### id 
+
+
+
+Checks for valid identifiers for layers, will automatically replace spaces and uppercase 
 
 This document is autogenerated from [src/UI/InputElement/Validators.ts](https://github.com/pietervdvn/MapComplete/blob/develop/src/UI/InputElement/Validators.ts)
diff --git a/Docs/TagInfo/mapcomplete_artwork.json b/Docs/TagInfo/mapcomplete_artwork.json
index 0606a047c..c1331641b 100644
--- a/Docs/TagInfo/mapcomplete_artwork.json
+++ b/Docs/TagInfo/mapcomplete_artwork.json
@@ -142,6 +142,155 @@
       "key": "amenity",
       "description": "Layer 'Artworks' shows  with a fixed text, namely 'This artwork does not serve as a bench' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') Picking this answer will delete the key amenity.",
       "value": ""
+    },
+    {
+      "key": "backrest",
+      "description": "Layer 'Artworks' 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 'Artworks' 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 'Artworks' shows backrest=yes with a fixed text, namely 'Does have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "yes"
+    },
+    {
+      "key": "backrest",
+      "description": "Layer 'Artworks' shows backrest=no with a fixed text, namely 'Does <b>not</b> have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "no"
+    },
+    {
+      "key": "seats",
+      "description": "Layer 'Artworks' 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 'Artworks' shows seats:separated=no with a fixed text, namely 'This bench does not have separated seats' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "no"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' 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 'Artworks' shows material=wood with a fixed text, namely 'The seating is made from wood' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "wood"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=metal with a fixed text, namely 'The seating is made from metal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "metal"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=stone with a fixed text, namely 'The seating is made from stone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "stone"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=concrete with a fixed text, namely 'The seating is made from concrete' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "concrete"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=plastic with a fixed text, namely 'The seating is made from plastic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "plastic"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=steel with a fixed text, namely 'The seating is made from steel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "steel"
+    },
+    {
+      "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)"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' 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 'Artworks' shows not:inscription=yes with a fixed text, namely 'This bench does not have an inscription' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "yes"
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Artworks' shows  with a fixed text, namely 'This bench does <span class='subtle'>(probably)</span> not have an inscription' (in the mapcomplete.org theme 'Artwork') Picking this answer will delete the key inscription. (This is only shown if amenity=bench)",
+      "value": ""
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Artworks' shows historic=memorial with a fixed text, namely 'This bench is a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "memorial"
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') Picking this answer will delete the key historic. (This is only shown if amenity=bench)",
+      "value": ""
+    },
+    {
+      "key": "not:historic",
+      "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Artwork') (This is only shown if amenity=bench)",
+      "value": "memorial"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/TagInfo/mapcomplete_benches.json b/Docs/TagInfo/mapcomplete_benches.json
index ba87b05f9..338a97a45 100644
--- a/Docs/TagInfo/mapcomplete_benches.json
+++ b/Docs/TagInfo/mapcomplete_benches.json
@@ -272,6 +272,91 @@
       "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (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 'Benches') (This is only shown if tourism=artwork)"
+    },
     {
       "key": "highway",
       "description": "The MapComplete theme Benches has a layer Benches at public transport stops showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json
index 83f416fd2..fea40f171 100644
--- a/Docs/TagInfo/mapcomplete_climbing.json
+++ b/Docs/TagInfo/mapcomplete_climbing.json
@@ -151,6 +151,25 @@
       "key": "contact:email",
       "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing gyms' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key charge.",
+      "value": ""
+    },
     {
       "key": "payment:cash",
       "description": "Layer 'Climbing gyms' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
@@ -296,6 +315,69 @@
       "description": "Layer 'Climbing gyms' shows service:climbing_rope:rental=no with a fixed text, namely 'A climbing rope can <b>not</b> 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 climbing:sport!=no)",
       "value": "no"
     },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "limited"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "climbing:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:sport~.+ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "climbing:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:toprope~.+ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "climbing:length",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:length' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no|climbing:toprope!=no)"
+    },
+    {
+      "key": "climbing:grade:french:min",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:min' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "climbing:grade:french:max",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:max' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing!~^(route)$&climbing:sport=yes|sport=climbing)"
+    },
+    {
+      "key": "climbing:bolts:max",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:bolts:max' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no)"
+    },
     {
       "key": "climbing:speed",
       "description": "Layer 'Climbing gyms' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
@@ -540,6 +622,48 @@
       "description": "Layer 'Climbing opportunities' shows rock=limestone with a fixed text, namely 'Limestone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing=crag|natural=cliff|natural=bare_rock)",
       "value": "limestone"
     },
+    {
+      "key": "url",
+      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'url' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if leisure!~^(sports_centre)$&sport=climbing)"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing opportunities' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key charge.",
+      "value": ""
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "limited"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
     {
       "key": "access",
       "description": "Layer 'Climbing opportunities' shows access=yes with a fixed text, namely 'Publicly accessible to 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 access~.+|)",
@@ -696,6 +820,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
@@ -905,6 +1853,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json
index 832941b40..4a050062c 100644
--- a/Docs/TagInfo/mapcomplete_cyclofix.json
+++ b/Docs/TagInfo/mapcomplete_cyclofix.json
@@ -258,6 +258,78 @@
       "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists')",
       "value": "no"
     },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "city_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "ebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "bmx"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "mtb"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "kid_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "tandem"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "racebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental=yes)",
+      "value": "bike_helmet"
+    },
+    {
+      "key": "capacity:city_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*city_bike.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:ebike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*ebike.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:kid_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*kid_bike.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:bmx",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bmx.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:mtb",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*mtb.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:bicycle_pannier",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:tandem_bicycle",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes)"
+    },
     {
       "key": "service:bicycle:second_hand",
       "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists')",
@@ -318,6 +390,25 @@
       "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists')",
       "value": "no"
     },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/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 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)",
+      "value": "no"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)",
+      "value": "yes"
+    },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)",
+      "value": ""
+    },
     {
       "key": "description",
       "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
diff --git a/Docs/TagInfo/mapcomplete_education.json b/Docs/TagInfo/mapcomplete_education.json
index ebd538d9e..867661812 100644
--- a/Docs/TagInfo/mapcomplete_education.json
+++ b/Docs/TagInfo/mapcomplete_education.json
@@ -62,6 +62,30 @@
       "description": "Layer 'Colleges and universities' shows isced:2011:level=doctorate with a fixed text, namely 'Doctorate degrees are awarded here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Education') (This is only shown if amenity=university)",
       "value": "doctorate"
     },
+    {
+      "key": "capacity",
+      "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Education')"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=mixed with a fixed text, namely 'Both boys and girls can enroll here and have classes together' and allows to pick this as a default answer (in the mapcomplete.org theme 'Education')",
+      "value": "mixed"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=separated with a fixed text, namely 'Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Education')",
+      "value": "separated"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=male with a fixed text, namely 'This is a boys only-school' and allows to pick this as a default answer (in the mapcomplete.org theme 'Education')",
+      "value": "male"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=female with a fixed text, namely 'This is a girls-only school' and allows to pick this as a default answer (in the mapcomplete.org theme 'Education')",
+      "value": "female"
+    },
     {
       "key": "website",
       "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Education')"
diff --git a/Docs/TagInfo/mapcomplete_healthcare.json b/Docs/TagInfo/mapcomplete_healthcare.json
index 154ee51cb..5f9333ab0 100644
--- a/Docs/TagInfo/mapcomplete_healthcare.json
+++ b/Docs/TagInfo/mapcomplete_healthcare.json
@@ -404,6 +404,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Healthcare')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Healthcare')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Healthcare')"
@@ -603,6 +1427,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Healthcare')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Healthcare')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Healthcare')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Healthcare')"
diff --git a/Docs/TagInfo/mapcomplete_indoors.json b/Docs/TagInfo/mapcomplete_indoors.json
index 1b1af26d5..9b9327b26 100644
--- a/Docs/TagInfo/mapcomplete_indoors.json
+++ b/Docs/TagInfo/mapcomplete_indoors.json
@@ -211,6 +211,190 @@
       "key": "capacity",
       "description": "Layer 'Indoors' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Indoors') (This is only shown if room=waiting|room=restaurant|room=office|room=nursery|room=conference|room=auditorium|room=chapel|room=bedroom|room=classroom)"
     },
+    {
+      "key": "name:etymology:wikidata",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'name:etymology:wikidata' (in the mapcomplete.org theme 'Indoors') (This is only shown if name:etymology!=unknown)"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'access' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=yes with a fixed text, namely 'Public access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=customers with a fixed text, namely 'Only access to customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "customers"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=key with a fixed text, namely 'Accessible, but one has to ask a key to enter' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "key"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=public with a fixed text, namely 'Public access' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "public"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Indoors' shows fee=yes with a fixed text, namely 'These are paid toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&access!=no)",
+      "value": "yes"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Indoors' shows fee=no with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&access!=no)",
+      "value": "no"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)"
+    },
+    {
+      "key": "payment:cash",
+      "description": "Layer 'Indoors' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:cards",
+      "description": "Layer 'Indoors' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:qr_code",
+      "description": "Layer 'Indoors' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:coins",
+      "description": "Layer 'Indoors' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:notes",
+      "description": "Layer 'Indoors' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:debit_cards",
+      "description": "Layer 'Indoors' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:credit_cards",
+      "description": "Layer 'Indoors' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&access!=no)"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Indoors' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&access!=no)",
+      "value": "24/7"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Indoors' shows wheelchair=yes with a fixed text, namely 'There is a dedicated toilet for wheelchair users' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Indoors' shows wheelchair=no with a fixed text, namely 'No wheelchair access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Indoors' shows wheelchair=designated with a fixed text, namely 'There is only a dedicated toilet for wheelchair users' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "designated"
+    },
+    {
+      "key": "door:width",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'door:width' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&wheelchair=yes|wheelchair=designated)"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=seated with a fixed text, namely 'There are only seated toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "seated"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=urinal with a fixed text, namely 'There are only urinals here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "urinal"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=squat with a fixed text, namely 'There are only squat toilets here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "squat"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=seated;urinal with a fixed text, namely 'Both seated toilets and urinals are available here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "seated;urinal"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Indoors' shows changing_table=yes with a fixed text, namely 'A changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Indoors' shows changing_table=no with a fixed text, namely 'No changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'changing_table:location' (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&changing_table=yes)"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=female_toilet with a fixed text, namely 'The changing table is in the toilet for women. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "female_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=male_toilet with a fixed text, namely 'The changing table is in the toilet for men. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "male_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=wheelchair_toilet with a fixed text, namely 'The changing table is in the toilet for wheelchair users. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "wheelchair_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=dedicated_room with a fixed text, namely 'The changing table is in a dedicated room. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "dedicated_room"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Indoors' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Indoors' shows toilets:handwashing=no with a fixed text, namely 'This toilets <b>don't</b> have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Indoors' shows toilets:paper_supplied=yes with a fixed text, namely 'This toilet is equipped with toilet paper' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&toilets:position!=urinal)",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Indoors' shows toilets:paper_supplied=no with a fixed text, namely 'You have to bring your own toilet paper to this toilet' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors') (This is only shown if amenity=toilets&toilets:position!=urinal)",
+      "value": "no"
+    },
     {
       "key": "highway",
       "description": "The MapComplete theme Indoors has a layer Pedestrian paths showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json
index 3f9b73d94..d6a050921 100644
--- a/Docs/TagInfo/mapcomplete_nature.json
+++ b/Docs/TagInfo/mapcomplete_nature.json
@@ -693,6 +693,91 @@
       "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (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 'Into nature') (This is only shown if tourism=artwork)"
+    },
     {
       "key": "leisure",
       "description": "The MapComplete theme Into nature has a layer Picnic tables showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json
index 68a7eb78d..6a66894ad 100644
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@@ -1278,6 +1278,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'OnWheels')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'OnWheels')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'OnWheels')"
diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json
index ec5bf1b03..479a6d530 100644
--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
@@ -419,6 +419,155 @@
       "description": "Layer 'Artworks' shows  with a fixed text, namely 'This artwork does not serve as a bench' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key amenity.",
       "value": ""
     },
+    {
+      "key": "backrest",
+      "description": "Layer 'Artworks' 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 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "yes"
+    },
+    {
+      "key": "two_sided",
+      "description": "Layer 'Artworks' 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 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "yes"
+    },
+    {
+      "key": "backrest",
+      "description": "Layer 'Artworks' shows backrest=yes with a fixed text, namely 'Does have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "yes"
+    },
+    {
+      "key": "backrest",
+      "description": "Layer 'Artworks' shows backrest=no with a fixed text, namely 'Does <b>not</b> have a backrest' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "no"
+    },
+    {
+      "key": "seats",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'seats' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)"
+    },
+    {
+      "key": "seats:separated",
+      "description": "Layer 'Artworks' shows seats:separated=no with a fixed text, namely 'This bench does not have separated seats' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "no"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'material' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=wood with a fixed text, namely 'The seating is made from wood' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "wood"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=metal with a fixed text, namely 'The seating is made from metal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "metal"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=stone with a fixed text, namely 'The seating is made from stone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "stone"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=concrete with a fixed text, namely 'The seating is made from concrete' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "concrete"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=plastic with a fixed text, namely 'The seating is made from plastic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "plastic"
+    },
+    {
+      "key": "material",
+      "description": "Layer 'Artworks' shows material=steel with a fixed text, namely 'The seating is made from steel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "steel"
+    },
+    {
+      "key": "direction",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'direction' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'colour' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=brown with a fixed text, namely 'Colour: brown' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "brown"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=green with a fixed text, namely 'Colour: green' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "green"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=gray with a fixed text, namely 'Colour: gray' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "gray"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=white with a fixed text, namely 'Colour: white' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "white"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=red with a fixed text, namely 'Colour: red' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "red"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=black with a fixed text, namely 'Colour: black' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "black"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=blue with a fixed text, namely 'Colour: blue' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "blue"
+    },
+    {
+      "key": "colour",
+      "description": "Layer 'Artworks' shows colour=yellow with a fixed text, namely 'Colour: yellow' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "yellow"
+    },
+    {
+      "key": "survey:date",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'survey:date' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)"
+    },
+    {
+      "key": "survey:date",
+      "description": "Layer 'Artworks' shows survey:date= with a fixed text, namely 'Surveyed today!' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key survey:date. (This is only shown if amenity=bench)",
+      "value": ""
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'inscription' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)"
+    },
+    {
+      "key": "not:inscription",
+      "description": "Layer 'Artworks' shows not:inscription=yes with a fixed text, namely 'This bench does not have an inscription' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "yes"
+    },
+    {
+      "key": "inscription",
+      "description": "Layer 'Artworks' shows  with a fixed text, namely 'This bench does <span class='subtle'>(probably)</span> not have an inscription' (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key inscription. (This is only shown if amenity=bench)",
+      "value": ""
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Artworks' shows historic=memorial with a fixed text, namely 'This bench is a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "memorial"
+    },
+    {
+      "key": "historic",
+      "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key historic. (This is only shown if amenity=bench)",
+      "value": ""
+    },
+    {
+      "key": "not:historic",
+      "description": "Layer 'Artworks' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=bench)",
+      "value": "memorial"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Personal theme has a layer ATMs showing features with this tag",
@@ -855,6 +1004,91 @@
       "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (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 'Personal theme') (This is only shown if tourism=artwork)"
+    },
     {
       "key": "highway",
       "description": "The MapComplete theme Personal theme has a layer Benches at public transport stops showing features with this tag",
@@ -2038,6 +2272,78 @@
       "description": "Layer 'Bike repair/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 'Personal theme')",
       "value": "no"
     },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Personal theme') (This is only shown if service:bicycle:rental=yes)"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "city_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "ebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "bmx"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "mtb"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "kid_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "tandem"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "racebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if service:bicycle:rental=yes)",
+      "value": "bike_helmet"
+    },
+    {
+      "key": "capacity:city_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*city_bike.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:ebike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*ebike.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:kid_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*kid_bike.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:bmx",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*bmx.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:mtb",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*mtb.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:bicycle_pannier",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*bicycle_pannier.*)$&service:bicycle:rental=yes)"
+    },
+    {
+      "key": "capacity:tandem_bicycle",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*tandem_bicycle.*)$&service:bicycle:rental=yes)"
+    },
     {
       "key": "service:bicycle:second_hand",
       "description": "Layer 'Bike repair/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 'Personal theme')",
@@ -2098,6 +2404,25 @@
       "description": "Layer 'Bike repair/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 'Personal theme')",
       "value": "no"
     },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/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 'Personal theme') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)",
+      "value": "no"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)",
+      "value": "yes"
+    },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash&amenity!=bicycle_wash)",
+      "value": ""
+    },
     {
       "key": "description",
       "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Personal theme')"
@@ -3961,6 +4286,48 @@
       "description": "Layer 'Climbing opportunities' shows rock=limestone with a fixed text, namely 'Limestone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if climbing=crag|natural=cliff|natural=bare_rock)",
       "value": "limestone"
     },
+    {
+      "key": "url",
+      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'url' (in the mapcomplete.org theme 'Personal theme') (This is only shown if leisure!~^(sports_centre)$&sport=climbing)"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing opportunities' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing opportunities' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing opportunities' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key charge.",
+      "value": ""
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "limited"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the mapcomplete.org theme 'Personal theme')"
+    },
     {
       "key": "club",
       "description": "The MapComplete theme Personal theme has a layer Climbing club showing features with this tag",
@@ -4073,6 +4440,25 @@
       "key": "contact:email",
       "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing gyms' shows fee=no with a fixed text, namely 'Climbing here is free of charge' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Climbing gyms' shows fee=yes with a fixed text, namely 'Paying a fee is required to climb here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key charge.",
+      "value": ""
+    },
     {
       "key": "payment:cash",
       "description": "Layer 'Climbing gyms' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
@@ -4218,6 +4604,69 @@
       "description": "Layer 'Climbing gyms' shows service:climbing_rope:rental=no with a fixed text, namely 'A climbing rope can <b>not</b> be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if climbing:sport!=no)",
       "value": "no"
     },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder=yes with a fixed text, namely 'Bouldering is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder=no with a fixed text, namely 'Bouldering is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder=limited with a fixed text, namely 'Bouldering is possible, although there are only a few problems' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "limited"
+    },
+    {
+      "key": "climbing:boulder",
+      "description": "Layer 'Climbing gyms' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder problems' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "key": "climbing:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:sport=yes with a fixed text, namely 'Sport climbing is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:sport=no with a fixed text, namely 'Sport climbing is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:sport~.+ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "key": "climbing:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:toprope=yes with a fixed text, namely 'Toprope climbing is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:toprope=no with a fixed text, namely 'Toprope climbing is not possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "climbing:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:toprope~.+ with a fixed text, namely 'There are {climbing:toprope} toprope routes' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "key": "climbing:length",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:length' (in the mapcomplete.org theme 'Personal theme') (This is only shown if climbing:sport!=no|climbing:toprope!=no)"
+    },
+    {
+      "key": "climbing:grade:french:min",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:min' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "key": "climbing:grade:french:max",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:grade:french:max' (in the mapcomplete.org theme 'Personal theme') (This is only shown if climbing!~^(route)$&climbing:sport=yes|sport=climbing)"
+    },
+    {
+      "key": "climbing:bolts:max",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:bolts:max' (in the mapcomplete.org theme 'Personal theme') (This is only shown if climbing:sport!=no)"
+    },
     {
       "key": "climbing:speed",
       "description": "Layer 'Climbing gyms' shows climbing:speed=yes with a fixed text, namely 'There is a speed climbing wall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
@@ -8120,6 +8569,190 @@
       "key": "capacity",
       "description": "Layer 'Indoors' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Personal theme') (This is only shown if room=waiting|room=restaurant|room=office|room=nursery|room=conference|room=auditorium|room=chapel|room=bedroom|room=classroom)"
     },
+    {
+      "key": "name:etymology:wikidata",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'name:etymology:wikidata' (in the mapcomplete.org theme 'Personal theme') (This is only shown if name:etymology!=unknown)"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'access' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=yes with a fixed text, namely 'Public access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=customers with a fixed text, namely 'Only access to customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "customers"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=key with a fixed text, namely 'Accessible, but one has to ask a key to enter' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "key"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Indoors' shows access=public with a fixed text, namely 'Public access' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "public"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Indoors' shows fee=yes with a fixed text, namely 'These are paid toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&access!=no)",
+      "value": "yes"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Indoors' shows fee=no with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&access!=no)",
+      "value": "no"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)"
+    },
+    {
+      "key": "payment:cash",
+      "description": "Layer 'Indoors' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:cards",
+      "description": "Layer 'Indoors' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:qr_code",
+      "description": "Layer 'Indoors' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:coins",
+      "description": "Layer 'Indoors' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:notes",
+      "description": "Layer 'Indoors' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:debit_cards",
+      "description": "Layer 'Indoors' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:credit_cards",
+      "description": "Layer 'Indoors' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&access!=no)"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Indoors' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&access!=no)",
+      "value": "24/7"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Indoors' shows wheelchair=yes with a fixed text, namely 'There is a dedicated toilet for wheelchair users' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Indoors' shows wheelchair=no with a fixed text, namely 'No wheelchair access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Indoors' shows wheelchair=designated with a fixed text, namely 'There is only a dedicated toilet for wheelchair users' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "designated"
+    },
+    {
+      "key": "door:width",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'door:width' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&wheelchair=yes|wheelchair=designated)"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=seated with a fixed text, namely 'There are only seated toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "seated"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=urinal with a fixed text, namely 'There are only urinals here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "urinal"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=squat with a fixed text, namely 'There are only squat toilets here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "squat"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Indoors' shows toilets:position=seated;urinal with a fixed text, namely 'Both seated toilets and urinals are available here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "seated;urinal"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Indoors' shows changing_table=yes with a fixed text, namely 'A changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Indoors' shows changing_table=no with a fixed text, namely 'No changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows and asks freeform values for key 'changing_table:location' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&changing_table=yes)"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=female_toilet with a fixed text, namely 'The changing table is in the toilet for women. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "female_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=male_toilet with a fixed text, namely 'The changing table is in the toilet for men. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "male_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=wheelchair_toilet with a fixed text, namely 'The changing table is in the toilet for wheelchair users. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "wheelchair_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Indoors' shows changing_table:location=dedicated_room with a fixed text, namely 'The changing table is in a dedicated room. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&changing_table=yes)",
+      "value": "dedicated_room"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Indoors' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Indoors' shows toilets:handwashing=no with a fixed text, namely 'This toilets <b>don't</b> have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets)",
+      "value": "no"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Indoors' shows toilets:paper_supplied=yes with a fixed text, namely 'This toilet is equipped with toilet paper' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&toilets:position!=urinal)",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Indoors' shows toilets:paper_supplied=no with a fixed text, namely 'You have to bring your own toilet paper to this toilet' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=toilets&toilets:position!=urinal)",
+      "value": "no"
+    },
     {
       "key": "information",
       "description": "The MapComplete theme Personal theme has a layer Information boards showing features with this tag",
@@ -10686,6 +11319,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Personal theme')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "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 'Personal theme')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Personal theme')"
@@ -11802,6 +13259,30 @@
       "description": "Layer 'Colleges and universities' shows isced:2011:level=doctorate with a fixed text, namely 'Doctorate degrees are awarded here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity=university)",
       "value": "doctorate"
     },
+    {
+      "key": "capacity",
+      "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Personal theme')"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=mixed with a fixed text, namely 'Both boys and girls can enroll here and have classes together' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "mixed"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=separated with a fixed text, namely 'Both boys and girls can enroll here but they are separated (e.g. they have lessons in different classrooms or at different times)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "separated"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=male with a fixed text, namely 'This is a boys only-school' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "male"
+    },
+    {
+      "key": "school:gender",
+      "description": "Layer 'Colleges and universities' shows school:gender=female with a fixed text, namely 'This is a girls-only school' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "female"
+    },
     {
       "key": "website",
       "description": "Layer 'Colleges and universities' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Personal theme')"
@@ -12427,6 +13908,80 @@
       "key": "toilets:door:width",
       "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:door:width' (in the mapcomplete.org theme 'Personal theme') (This is only shown if toilets:wheelchair=yes|toilets:wheelchair=designated)"
     },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=seated with a fixed text, namely 'There are only seated toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "seated"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=urinal with a fixed text, namely 'There are only urinals here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "urinal"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=squat with a fixed text, namely 'There are only squat toilets here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "squat"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=seated;urinal with a fixed text, namely 'Both seated toilets and urinals are available here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "seated;urinal"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Toilets at other amenities' shows changing_table=yes with a fixed text, namely 'A changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Toilets at other amenities' shows changing_table=no with a fixed text, namely 'No changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'changing_table:location' (in the mapcomplete.org theme 'Personal theme') (This is only shown if changing_table=yes)"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=female_toilet with a fixed text, namely 'The changing table is in the toilet for women. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if changing_table=yes)",
+      "value": "female_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=male_toilet with a fixed text, namely 'The changing table is in the toilet for men. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if changing_table=yes)",
+      "value": "male_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=wheelchair_toilet with a fixed text, namely 'The changing table is in the toilet for wheelchair users. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if changing_table=yes)",
+      "value": "wheelchair_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=dedicated_room with a fixed text, namely 'The changing table is in a dedicated room. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if changing_table=yes)",
+      "value": "dedicated_room"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=no with a fixed text, namely 'This toilets <b>don't</b> have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=yes with a fixed text, namely 'This toilet is equipped with toilet paper' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if toilets:position!=urinal)",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=no with a fixed text, namely 'You have to bring your own toilet paper to this toilet' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if toilets:position!=urinal)",
+      "value": "no"
+    },
     {
       "key": "toilets:description",
       "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:description' (in the mapcomplete.org theme 'Personal theme')"
diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json
index 000593874..e45385925 100644
--- a/Docs/TagInfo/mapcomplete_pets.json
+++ b/Docs/TagInfo/mapcomplete_pets.json
@@ -621,6 +621,830 @@
       "key": "name",
       "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Dog-friendly shops' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Dog-friendly shops' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
diff --git a/Docs/TagInfo/mapcomplete_playgrounds.json b/Docs/TagInfo/mapcomplete_playgrounds.json
index d44487788..92903d04a 100644
--- a/Docs/TagInfo/mapcomplete_playgrounds.json
+++ b/Docs/TagInfo/mapcomplete_playgrounds.json
@@ -365,6 +365,91 @@
       "description": "Layer 'Benches' shows not:historic=memorial with a fixed text, namely 'This bench is a <b>not</b> a memorial for someone or something' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (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 'Playgrounds') (This is only shown if tourism=artwork)"
+    },
     {
       "key": "leisure",
       "description": "The MapComplete theme Playgrounds has a layer Picnic tables showing features with this tag",
diff --git a/Docs/TagInfo/mapcomplete_shops.json b/Docs/TagInfo/mapcomplete_shops.json
index 7abcf78a2..72d1f5029 100644
--- a/Docs/TagInfo/mapcomplete_shops.json
+++ b/Docs/TagInfo/mapcomplete_shops.json
@@ -48,6 +48,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Shops')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Shops')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Shops')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Shops')"
diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json
index 3fb18f693..215f93b46 100644
--- a/Docs/TagInfo/mapcomplete_sports.json
+++ b/Docs/TagInfo/mapcomplete_sports.json
@@ -574,6 +574,830 @@
       "key": "name",
       "description": "Layer 'Shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Sports')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Sports')"
+    },
+    {
+      "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')",
+      "value": "vacant"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "value": "wine"
+    },
     {
       "key": "opening_hours",
       "description": "Layer 'Shop' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Sports')"
diff --git a/Docs/TagInfo/mapcomplete_toilets.json b/Docs/TagInfo/mapcomplete_toilets.json
index cdf220d3a..e0f513297 100644
--- a/Docs/TagInfo/mapcomplete_toilets.json
+++ b/Docs/TagInfo/mapcomplete_toilets.json
@@ -368,6 +368,80 @@
       "key": "toilets:door:width",
       "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:door:width' (in the mapcomplete.org theme 'Public toilets') (This is only shown if toilets:wheelchair=yes|toilets:wheelchair=designated)"
     },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=seated with a fixed text, namely 'There are only seated toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "seated"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=urinal with a fixed text, namely 'There are only urinals here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "urinal"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=squat with a fixed text, namely 'There are only squat toilets here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "squat"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets at other amenities' shows toilets:position=seated;urinal with a fixed text, namely 'Both seated toilets and urinals are available here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "seated;urinal"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Toilets at other amenities' shows changing_table=yes with a fixed text, namely 'A changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "yes"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Toilets at other amenities' shows changing_table=no with a fixed text, namely 'No changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "no"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'changing_table:location' (in the mapcomplete.org theme 'Public toilets') (This is only shown if changing_table=yes)"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=female_toilet with a fixed text, namely 'The changing table is in the toilet for women. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets') (This is only shown if changing_table=yes)",
+      "value": "female_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=male_toilet with a fixed text, namely 'The changing table is in the toilet for men. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets') (This is only shown if changing_table=yes)",
+      "value": "male_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=wheelchair_toilet with a fixed text, namely 'The changing table is in the toilet for wheelchair users. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets') (This is only shown if changing_table=yes)",
+      "value": "wheelchair_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets at other amenities' shows changing_table:location=dedicated_room with a fixed text, namely 'The changing table is in a dedicated room. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets') (This is only shown if changing_table=yes)",
+      "value": "dedicated_room"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Toilets at other amenities' shows toilets:handwashing=no with a fixed text, namely 'This toilets <b>don't</b> have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets')",
+      "value": "no"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=yes with a fixed text, namely 'This toilet is equipped with toilet paper' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets') (This is only shown if toilets:position!=urinal)",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Toilets at other amenities' shows toilets:paper_supplied=no with a fixed text, namely 'You have to bring your own toilet paper to this toilet' and allows to pick this as a default answer (in the mapcomplete.org theme 'Public toilets') (This is only shown if toilets:position!=urinal)",
+      "value": "no"
+    },
     {
       "key": "toilets:description",
       "description": "Layer 'Toilets at other amenities' shows and asks freeform values for key 'toilets:description' (in the mapcomplete.org theme 'Public toilets')"
diff --git a/Docs/Themes/mapcomplete-changes.md b/Docs/Themes/mapcomplete-changes.md
new file mode 100644
index 000000000..52a9923aa
--- /dev/null
+++ b/Docs/Themes/mapcomplete-changes.md
@@ -0,0 +1,36 @@
+[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
+
+ Changes made with MapComplete ( [mapcomplete-changes](https://mapcomplete.org/mapcomplete-changes) ) 
+------------------------------------------------------------------------------------------------------
+
+
+
+This maps shows all the changes made with MapComplete
+
+This theme contains the following layers:
+
+
+
+  - [mapcomplete-changes](../Layers/mapcomplete-changes.md)
+  - [current_view](../Layers/current_view.md)
+  - [selected_element](../Layers/selected_element.md)
+  - [gps_location](../Layers/gps_location.md)
+  - [gps_location_history](../Layers/gps_location_history.md)
+  - [home_location](../Layers/home_location.md)
+  - [gps_track](../Layers/gps_track.md)
+  - [range](../Layers/range.md)
+  - [last_click](../Layers/last_click.md)
+
+
+Available languages:
+
+
+
+  - en
+  - ca
+  - de
+  - fr
+  - nl
+ 
+
+This document is autogenerated from [assets/themes/mapcomplete-changes/mapcomplete-changes.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/mapcomplete-changes/mapcomplete-changes.json)
diff --git a/src/UI/InputElement/Validators/IdValidator.ts b/src/UI/InputElement/Validators/IdValidator.ts
new file mode 100644
index 000000000..e69de29bb