Merge develop

2024-12-31 16:31:55 +01:00 · 2024-12-31 16:31:55 +01:00 · 00c233a2eb
commit 00c233a2eb
parent a34abb702c 6cb16877e8
188 changed files with 4982 additions and 1745 deletions
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@ -16,6 +16,7 @@
 - bank
 - barrier
 - bbq
+ - beehive
 - bench
 - bench_at_pt
 - bicycle_counter
@ -68,6 +69,7 @@
 - ice_cream
 - indoors
 - information_board
+ - insect_hotel
 - item_with_image
 - kerbs
 - lighthouse
@ -452,6 +454,11 @@
             - cafe_pub
 - food
            
+            ### seating
+
+             - cafe_pub
+ - food
+            
            ### dog-access

             - cafe_pub
@ -490,6 +497,11 @@
 - playground
 - sport_pitch
            
+            ### maxstay
+
+             - charging_station
+ - parking
+            
            ### climbing.website

             - climbing_area
--- a/Docs/BuiltinQuestions.md
+++ b/Docs/BuiltinQuestions.md
@ -68,6 +68,9 @@ This is a special layer - data is not sourced from OpenStreetMap
  - [preset_description](#preset_description)
  - [brand](#brand)
  - [indoor](#indoor)
+  - [seating](#seating)
+  - [maxstay](#maxstay)
+  - [name](#name)
 2. [Filters](#filters)

 ## Supported attributes
@ -109,6 +112,8 @@ This is a special layer - data is not sourced from OpenStreetMap
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/shower#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/shower/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [shower](https://wiki.openstreetmap.org/wiki/Key:shower) | Multiple choice | [hot](https://wiki.openstreetmap.org/wiki/Tag:shower%3Dhot) [cold](https://wiki.openstreetmap.org/wiki/Tag:shower%3Dcold) [yes](https://wiki.openstreetmap.org/wiki/Tag:shower%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:shower%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/brand#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/brand/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/indoor#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/indoor/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/maxstay#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/maxstay/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [maxstay](https://wiki.openstreetmap.org/wiki/Key:maxstay) | [pfloat](../SpecialInputElements.md#pfloat) | [unlimited](https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) |  |

 ### questions
 Show the questions block at this location
@ -549,6 +554,25 @@ The question is `Is this object located indoors?`
 -  *This object is located indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor' target='_blank'>indoor</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes' target='_blank'>yes</a>
 -  *This object is located outdoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor' target='_blank'>indoor</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
+### maxstay
+
+The question is `What is the maximum amount of time one is allowed to stay here?`
+*One can stay at most <b>{canonical(maxstay)}</b>* is shown if `maxstay` is set
+
+ -  *There is no limit to the amount of time one can stay here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>
+
+### name
+
+The question is `What is the name of this place?`
+*<b>{name}</b>* is shown if `name` is set
+
 ## Filters

 | id | question | osmTags |
--- a/Docs/ELI-overview.md
+++ b/Docs/ELI-overview.md
@ -309,6 +309,8 @@ This table gives a summary of ids, names and other metainformation. [See the onl
 | Tours-Orthophoto-2008_2010 | Tours - Orthophotos 2008-2010 | historicphoto |  | Orthophoto Tour(s) Plus 2008 |
 | fr.dpt.84.2010 | Vaucluse 2010 | historicphoto |  | ORTHO 2010 © PACA-04-05-84 |
 | Vercors-Orthophotos-1999 | Vercors (Réserve naturelle des Hauts-Plateaux du Vercors) - Orthophoto - 1999 - 1 m | historicphoto |  | Parc Naturel Régional du Vercors |
+| EA_LIDAR_DSM_1m_2022 | EA LiDAR Digital Surface Model 1m (2022) | elevation |  | Environment Agency |
+| EA_LIDAR_DTM_1m_2022 | EA LiDAR Digital Terrain Model 1m (2022) | elevation |  | Environment Agency |
 | Hampshire-Aerial-FCIR | Hampshire Aerial FCIR | photo |  |  |
 | Hampshire-Aerial-RGB | Hampshire Aerial RGB | photo |  |  |
 | NLS-OS-NatGrid-11250-1940-60 | NLS - OS 1:1,250 National Grid Maps, 1940s-1960s | historicmap |  | National Library of Scotland Historic Maps |
@ -519,6 +521,7 @@ This table gives a summary of ids, names and other metainformation. [See the onl
 | UkraineVinnytsiaTG2021 | Ukraine - Vinnytsia TG 2021 | photo |  | © Вінницька міська рада |
 | Canvec_French | Canvec - French | map |  |  |
 | Canvec | Canvec - English | map |  |  |
+| Toronto-Imagery-Most-Current-Year | Toronto Latest Orthoimagery | photo |  | Contains information licensed under the Open Government Licence – Toronto |
 | Geobase_Roads_French | Geobase Roads - French | other |  |  |
 | Geobase_Roads | Geobase Roads - English | other |  |  |
 | canaan_drone_red_cross_201712 | Canaan - American Red Cross, Dec-2017 | photo |  | American Red Cross |
@ -791,7 +794,7 @@ This table gives a summary of ids, names and other metainformation. [See the onl
 | DVRPC_2020_MontgomeryPA | DVRPC Orthoimagery 2020 - Montgomery County (1ft) | photo |  | Delaware Valley Regional Planning Commission |
 | DVRPC_2020_PhiladelphiaPA | DVRPC Orthoimagery 2020 - Philadelphia County (1ft) | photo |  | Delaware Valley Regional Planning Commission |
 | PEMA_Orthoimagery | PEMA Orthoimagery (2018-2020) | historicphoto |  | Pennsylvania Emergency Management Agency |
-| PEMA_Orthoimagery_2022 | PEMA Orthoimagery (Western) [2022] | photo | ⭐ | Pennsylvania Emergency Management Agency |
+| PEMA_Orthoimagery_2023 | PEMA Orthoimagery Cycle 2 (2021-2023) | photo |  | Pennsylvania Emergency Management Agency |
 | Philadelphia_Ortho_2020 | Philadelphia Orthoimagery 2020 (3in) | historicphoto |  | City of Philadelphia |
 | Philadelphia_Ortho_2022 | Philadelphia Orthoimagery 2022 (2in) | historicphoto |  | City of Philadelphia |
 | Philadelphia_Ortho_2023 | Philadelphia Orthoimagery 2023 | photo | ⭐ | City of Philadelphia |
--- a/Docs/Layers/aerialway.md
+++ b/Docs/Layers/aerialway.md
@ -2,7 +2,7 @@

 # aerialway

-Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines. 
+Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines.

 - This layer is shown at zoomlevel **11** and higher

@ -67,9 +67,9 @@ The question is `What type of aerialway is this?`
 -  *A drag lift with T-shaped carriers for two passengers at a time* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Dt-bar' target='_blank'>t-bar</a>
 -  *A drag lift with L-shaped bars for a single passenger at a time* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Dj-bar' target='_blank'>j-bar</a>
 -  *A drag lift with a platter to drag a single passenger at a time* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Dplatter' target='_blank'>platter</a>
- -  *A tow line which which drags skieers* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Drope_tow' target='_blank'>rope_tow</a>
+ -  *A tow line which skiers hold on to or attach themselves onto* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Drope_tow' target='_blank'>rope_tow</a>
 -  *A magic carpet (a conveyor belt on the ground)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Dmagic_carpet' target='_blank'>magic_carpet</a>
- -  *A zip line. (A touristical attraction where adventurous people go down at high speeds) * is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Dzip_line' target='_blank'>zip_line</a>
+ -  *A zip line. (A touristic attraction where adventurous people go down at high speeds)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:aerialway' target='_blank'>aerialway</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:aerialway%3Dzip_line' target='_blank'>zip_line</a>

 ### duration

--- a/Docs/Layers/animal_shelter.md
+++ b/Docs/Layers/animal_shelter.md
@ -2,7 +2,7 @@

 # animal_shelter

-An animal shelter is a facility where animals in trouble are brought and facility's staff (volunteers or not) feeds them and cares of them, rehabilitating and healing them if necessary. This definition includes kennels for abandoned dogs, catteries for abandoned cats, shelters for other abandoned pets and wildlife recovery centres. 
+An animal shelter is a facility where animals in trouble are brought and facility's staff (volunteers or not) feeds them and cares of them, rehabilitating and healing them if necessary. This definition includes kennels for abandoned dogs, catteries for abandoned cats, shelters for other abandoned pets and wildlife recovery centres.

 - This layer is shown at zoomlevel **0** and higher

--- a/Docs/Layers/assisted_repair.md
+++ b/Docs/Layers/assisted_repair.md
@ -2,7 +2,7 @@

 # assisted_repair

-A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location.  A repair café is a type of event organized regularly along the same principles.
+A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location. A repair café is a type of event organized regularly along the same principles.

 - This layer is shown at zoomlevel **1** and higher

--- a/Docs/Layers/bbq.md
+++ b/Docs/Layers/bbq.md
@ -57,30 +57,30 @@ _This tagrendering has no question and is thus read-only_

 ### access

-The question is `What is the permitted access?`
+The question is `Who is allowed to use this barbecue?`

- -  *Public* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes' target='_blank'>yes</a>
- -  *No access* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dno' target='_blank'>no</a>
- -  *Private* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dprivate' target='_blank'>private</a>
- -  *Access until revoked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dpermissive' target='_blank'>permissive</a>
- -  *Access only for customers* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dcustomers' target='_blank'>customers</a>
- -  *Access only for authorized persons* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dpermit' target='_blank'>permit</a>
+ -  *This barbecue can be used by anyone* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dyes' target='_blank'>yes</a>
+ -  *This barbecue can't be used by anyone* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dno' target='_blank'>no</a>
+ -  *This barbecue is private* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dprivate' target='_blank'>private</a>
+ -  *This barbecue can be used by anyone, but the owner can revoke access at any time* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dpermissive' target='_blank'>permissive</a>
+ -  *This barbecue can only be used by customers* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dcustomers' target='_blank'>customers</a>
+ -  *This barbecue can only be used by authorized persons* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:access' target='_blank'>access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:access%3Dpermit' target='_blank'>permit</a>

 ### covered

-The question is `Is the grill covered?`
+The question is `Is this barbecue covered?`

- -  *The grill is not covered* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:covered' target='_blank'>covered</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:covered%3Dno' target='_blank'>no</a>
- -  *The grill is covered* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:covered' target='_blank'>covered</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:covered%3Dyes' target='_blank'>yes</a>
+ -  *This barbecue is not covered* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:covered' target='_blank'>covered</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:covered%3Dno' target='_blank'>no</a>
+ -  *This barbecue is covered* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:covered' target='_blank'>covered</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:covered%3Dyes' target='_blank'>yes</a>

 ### fuel

-The question is `How ist the grill fueled?`
+The question is `How is this barbecue fuelled?`

- -  *Wood* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Dwood' target='_blank'>wood</a>
- -  *Charcoal* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Dcharcoal' target='_blank'>charcoal</a>
- -  *Electric* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Delectric' target='_blank'>electric</a>
- -  *Gas* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Dgas' target='_blank'>gas</a>
+ -  *This barbecue uses wood as fuel* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Dwood' target='_blank'>wood</a>
+ -  *This barbecue uses charcoal as fuel* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Dcharcoal' target='_blank'>charcoal</a>
+ -  *This barbecue is powered by electricity* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Delectric' target='_blank'>electric</a>
+ -  *This barbecue uses gas as fuel* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:fuel' target='_blank'>fuel</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fuel%3Dgas' target='_blank'>gas</a>

 ### leftover-questions

--- a/Docs/Layers/beehive.md
+++ b/Docs/Layers/beehive.md
@ -0,0 +1,83 @@
+[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
+
+# beehive
+
+Layer showing beehives
+
+ - This layer is shown at zoomlevel **11** and higher
+
+## Table of contents
+
+1. [Themes using this layer](#themes-using-this-layer)
+2. [Presets](#presets)
+3. [Basic tags for this layer](#basic-tags-for-this-layer)
+4. [Supported attributes](#supported-attributes)
+  - [images](#images)
+  - [capacity](#capacity)
+  - [leftover-questions](#leftover-questions)
+  - [move-button](#move-button)
+  - [delete-button](#delete-button)
+  - [lod](#lod)
+
+## Themes using this layer
+
+ - [insects](https://mapcomplete.org/insects)
+ - [personal](https://mapcomplete.org/personal)
+
+## Presets
+
+The following options to create new points are included:
+
+ - **a beehive** which has the following tags:<a href='https://wiki.openstreetmap.org/wiki/Key:man_made' target='_blank'>man_made</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeehive' target='_blank'>beehive</a>
+
+## Basic tags for this layer
+
+Elements must match the expression **<a href='https://wiki.openstreetmap.org/wiki/Key:man_made' target='_blank'>man_made</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeehive' target='_blank'>beehive</a>**
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22man_made%22%3D%22beehive%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+## Supported attributes
+
+**Warning:**,this quick overview is incomplete,
+
+| attribute | type | values which are supported by this layer |
+-----|-----|----- |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) | [1](https://wiki.openstreetmap.org/wiki/Tag:capacity%3D1) |
+
+### images
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images
+_This tagrendering has no question and is thus read-only_
+*{image_carousel()}{image_upload()}*
+
+### capacity
+
+The question is `How many beehives are there?`
+*There are {capacity} beehives* is shown if `capacity` is set
+
+ -  *There is 1 beehive* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:capacity' target='_blank'>capacity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:capacity%3D1' target='_blank'>1</a>
+
+### leftover-questions
+
+_This tagrendering has no question and is thus read-only_
+*{questions( ,)}*
+
+### move-button
+
+_This tagrendering has no question and is thus read-only_
+*{move_button()}*
+
+### delete-button
+
+_This tagrendering has no question and is thus read-only_
+*{delete_button()}*
+
+### lod
+
+_This tagrendering has no question and is thus read-only_
+*{linked_data_from_website()}*
+
+This tagrendering has labels 
+`added_by_default`
+
+
+This document is autogenerated from [assets/layers/beehive/beehive.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/beehive/beehive.json)
--- a/Docs/Layers/bicycle_assisted_repair_workshop.md
+++ b/Docs/Layers/bicycle_assisted_repair_workshop.md
@ -4,7 +4,7 @@

 This layer is based on [assisted_repair](../Layers/assisted_repair.md)

-A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location.  A repair café is a type of event organized regularly along the same principles.
+A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location. A repair café is a type of event organized regularly along the same principles.

 - This layer is shown at zoomlevel **11** and higher

--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
@ -76,10 +76,11 @@ Elements must match **any** of the following expressions:

 - <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair' target='_blank'>service:bicycle:repair</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes' target='_blank'>yes</a>
 - <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:retail' target='_blank'>service:bicycle:retail</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:retail%3Dyes' target='_blank'>yes</a>
+ - <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:second_hand' target='_blank'>service:bicycle:second_hand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dyes' target='_blank'>yes</a>
 - <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle' target='_blank'>bicycle</a>
 - <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports' target='_blank'>sports</a> & (<a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dbicycle' target='_blank'>bicycle</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dcycling' target='_blank'>cycling</a> | sport=) & service:bicycle:retail!=no & service:bicycle:repair!=no

-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22service%3Abicycle%3Arepair%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22service%3Abicycle%3Aretail%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22bicycle%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22bicycle%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22cycling%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B!%22sport%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22service%3Abicycle%3Arepair%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22service%3Abicycle%3Aretail%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22service%3Abicycle%3Asecond_hand%22%3D%22yes%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22bicycle%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22bicycle%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B%22sport%22%3D%22cycling%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22shop%22%3D%22sports%22%5D%5B!%22sport%22%5D%5B%22service%3Abicycle%3Aretail%22!%3D%22no%22%5D%5B%22service%3Abicycle%3Arepair%22!%3D%22no%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)

 ## Supported attributes

--- a/Docs/Layers/brothel.md
+++ b/Docs/Layers/brothel.md
@ -2,7 +2,7 @@

 # brothel

-An establishment specifically dedicated to prostitution. 
+An establishment specifically dedicated to prostitution.

 - This layer is shown at zoomlevel **6** and higher

--- a/Docs/Layers/cafe_pub.md
+++ b/Docs/Layers/cafe_pub.md
@ -26,6 +26,7 @@ A layer showing cafés and pubs where one can gather around a drink. The layer a
  - [wheelchair-access](#wheelchair-access)
  - [smoking](#smoking)
  - [service:electricity](#serviceelectricity)
+  - [seating](#seating)
  - [dog-access](#dog-access)
  - [internet](#internet)
  - [internet-fee](#internet-fee)
@ -202,6 +203,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -299,6 +307,14 @@ This tagrendering has labels
 -----|-----|----- |
 | has_electricity.0 | Offers electricity | service:electricity=yes |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | dogs.0 | *No preference towards dogs* (default) |  |
--- a/Docs/Layers/charging_station.md
+++ b/Docs/Layers/charging_station.md
@ -1262,9 +1262,9 @@ This tagrendering is only visible in the popup if the following condition is met
 The question is `What is the maximum amount of time one is allowed to stay here?`
 *One can stay at most <b>{canonical(maxstay)}</b>* is shown if `maxstay` is set

- -  *No timelimit on leaving your vehicle here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>
+ -  *There is no limit to the amount of time one can stay here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>

-This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a> | maxstay~.+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a>

 ### Network

--- a/Docs/Layers/charging_station_ebikes.md
+++ b/Docs/Layers/charging_station_ebikes.md
@ -1251,9 +1251,9 @@ This tagrendering is only visible in the popup if the following condition is met
 The question is `What is the maximum amount of time one is allowed to stay here?`
 *One can stay at most <b>{canonical(maxstay)}</b>* is shown if `maxstay` is set

- -  *No timelimit on leaving your vehicle here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>
+ -  *There is no limit to the amount of time one can stay here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>

-This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a> | maxstay~.+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a>

 ### Network

--- a/Docs/Layers/cinema.md
+++ b/Docs/Layers/cinema.md
@ -2,7 +2,7 @@

 # cinema

- A place showing movies (films), generally open to the public for a fee. Commonly referred to as a movie theater in the US
+A place showing movies (films), generally open to the public for a fee. Commonly referred to as a movie theater in the US.

 - This layer is shown at zoomlevel **10** and higher

--- a/Docs/Layers/climbing_gym.md
+++ b/Docs/Layers/climbing_gym.md
@ -27,6 +27,8 @@ A climbing gym
  - [toprope](#toprope)
  - [shoe_rental](#shoe_rental)
  - [harness_rental](#harness_rental)
+  - [auto_belay_toprope](#auto_belay_toprope)
+  - [auto_belay_lead](#auto_belay_lead)
  - [belay_device_rental](#belay_device_rental)
  - [rope_rental](#rope_rental)
  - [average_length](#average_length)
@ -59,9 +61,9 @@ The following options to create new points are included:
 Elements must match **all** of the following expressions:

 0. <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing' target='_blank'>climbing</a>
-1. <a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dsports_centre' target='_blank'>sports_centre</a>
+1. <a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dsports_centre' target='_blank'>sports_centre</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dsports_hall' target='_blank'>sports_hall</a>

-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22sport%22%3D%22climbing%22%5D%5B%22leisure%22%3D%22sports_centre%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22sport%22%3D%22climbing%22%5D%5B%22leisure%22%3D%22sports_centre%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22sport%22%3D%22climbing%22%5D%5B%22leisure%22%3D%22sports_hall%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)

 ## Supported attributes

@ -80,6 +82,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/climbing:toprope#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/climbing%3Atoprope/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:climbing_shoes:rental#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Aclimbing_shoes%3Arental/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:climbing_harness:rental#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Aclimbing_harness%3Arental/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/climbing:autobelay:toprope#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/climbing%3Aautobelay%3Atoprope/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [climbing:autobelay:toprope](https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:toprope) | [nat](../SpecialInputElements.md#nat) | [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Dyes) [all](https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Dall) [only](https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Donly) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/climbing:autobelay:sport#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/climbing%3Aautobelay%3Asport/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [climbing:autobelay:sport](https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:sport) | [nat](../SpecialInputElements.md#nat) | [no](https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:sport%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:sport%3Dyes) [all](https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:sport%3Dall) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:climbing_rope:rental#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Aclimbing_rope%3Arental/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/climbing:length#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/climbing%3Alength/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [climbing:length](https://wiki.openstreetmap.org/wiki/Key:climbing:length) | [pfloat](../SpecialInputElements.md#pfloat) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/climbing:grade:french:min#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/climbing%3Agrade%3Afrench%3Amin/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [climbing:grade:french:min](https://wiki.openstreetmap.org/wiki/Key:climbing:grade:french:min) | [string](../SpecialInputElements.md#string) |  |
@ -187,7 +191,7 @@ The question is `Is toprope climbing possible here?`

 ### shoe_rental

-The question is `Can one rent climbing shoes here?`
+The question is `Can one rent climbing shoes here to use in the gym?`

 -  *Climbing shoes can be borrowed for free here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_shoes:rental' target='_blank'>service:climbing_shoes:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dyes' target='_blank'>yes</a> & <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_shoes:rental:fee' target='_blank'>service:climbing_shoes:rental:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental:fee%3Dno' target='_blank'>no</a>
 -  *Climbing shoes can be rented here for {service:climbing_shoes:rental:charge}* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_shoes:rental' target='_blank'>service:climbing_shoes:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_shoes:rental%3Dyes' target='_blank'>yes</a> & service:climbing_shoes:rental:charge~.+. _This option cannot be chosen as answer_
@ -196,16 +200,41 @@ The question is `Can one rent climbing shoes here?`

 ### harness_rental

-The question is `Can one rent a climbing harness here?`
+The question is `Can one rent a climbing harness here to use in the gym?`

 -  *A climbing harness can be borrowed for free here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_harness:rental' target='_blank'>service:climbing_harness:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dyes' target='_blank'>yes</a> & <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_harness:rental:fee' target='_blank'>service:climbing_harness:rental:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental:fee%3Dno' target='_blank'>no</a>
 -  *A climbing harness can be rented here for {service:climbing_harness:rental:charge}* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_harness:rental' target='_blank'>service:climbing_harness:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dyes' target='_blank'>yes</a> & service:climbing_harness:rental:charge~.+. _This option cannot be chosen as answer_
 -  *A climbing harness can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_harness:rental' target='_blank'>service:climbing_harness:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dyes' target='_blank'>yes</a>
 -  *A climbing harness can <b>not</b> be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_harness:rental' target='_blank'>service:climbing_harness:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_harness:rental%3Dno' target='_blank'>no</a>

+This tagrendering is only visible in the popup if the following condition is met: (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no) | (climbing:speed~.+ & climbing:speed!=no)
+
+### auto_belay_toprope
+
+The question is `Are there auto belays for top roping here?`
+*There are {climbing:autobelay:toprope} auto belay devices for top roping* is shown if `climbing:autobelay:toprope` is set
+
+ -  *There are no auto belays for top roping* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:toprope' target='_blank'>climbing:autobelay:toprope</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Dno' target='_blank'>no</a>
+ -  *There are a number of auto belays for top roping* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:toprope' target='_blank'>climbing:autobelay:toprope</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Dyes' target='_blank'>yes</a>
+ -  *There is an auto belay for every top rope route but manual belaying is also possible* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:toprope' target='_blank'>climbing:autobelay:toprope</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Dall' target='_blank'>all</a>
+ -  *Top rope routes can only be climbed on auto belay* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:toprope' target='_blank'>climbing:autobelay:toprope</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:toprope%3Donly' target='_blank'>only</a>
+
+This tagrendering is only visible in the popup if the following condition is met: climbing:toprope~.+ & climbing:toprope!=no
+
+### auto_belay_lead
+
+The question is `Are there auto belays for lead climbing here?`
+*There are {climbing:autobelay:sport} auto belays for lead climbing* is shown if `climbing:autobelay:sport` is set
+
+ -  *There are no auto belays for lead climbing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:sport' target='_blank'>climbing:autobelay:sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:sport%3Dno' target='_blank'>no</a>
+ -  *There is a number of auto belays for lead climbing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:sport' target='_blank'>climbing:autobelay:sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:sport%3Dyes' target='_blank'>yes</a>
+ -  *There is an auto belay for every lead climbing route* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:autobelay:sport' target='_blank'>climbing:autobelay:sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:autobelay:sport%3Dall' target='_blank'>all</a>
+
+This tagrendering is only visible in the popup if the following condition is met: climbing:sport~.+ & climbing:sport!=no
+
 ### belay_device_rental

-The question is `Can one rent a belay device here?`
+The question is `Can one rent a belay device here to use in the gym?`

 -  *Belay devices are provided at each rope* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_belay_device:provided_at_each_rope' target='_blank'>service:climbing_belay_device:provided_at_each_rope</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_belay_device:provided_at_each_rope%3Dyes' target='_blank'>yes</a>
 -  *A belay device can be borrowed for free here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_belay_device:rental' target='_blank'>service:climbing_belay_device:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_belay_device:rental%3Dyes' target='_blank'>yes</a> & <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_belay_device:rental:fee' target='_blank'>service:climbing_belay_device:rental:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_belay_device:rental:fee%3Dno' target='_blank'>no</a>
@ -213,9 +242,11 @@ The question is `Can one rent a belay device here?`
 -  *A belay device can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_belay_device:rental' target='_blank'>service:climbing_belay_device:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_belay_device:rental%3Dyes' target='_blank'>yes</a>
 -  *A belay device can <b>not</b> be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_belay_device:rental' target='_blank'>service:climbing_belay_device:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_belay_device:rental%3Dno' target='_blank'>no</a>

+This tagrendering is only visible in the popup if the following condition is met: (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no)
+
 ### rope_rental

-The question is `Can one rent a climbing rope here?`
+The question is `Can one rent a climbing rope here to use in the gym?`

 -  *A climbing rope can be borrowed for free here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_rope:rental' target='_blank'>service:climbing_rope:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dyes' target='_blank'>yes</a> & <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_rope:rental:fee' target='_blank'>service:climbing_rope:rental:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental:fee%3Dno' target='_blank'>no</a>
 -  *A climbing rope can be rented here for {service:climbing_rope:rental:charge}* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:climbing_rope:rental' target='_blank'>service:climbing_rope:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:climbing_rope:rental%3Dyes' target='_blank'>yes</a> & service:climbing_rope:rental:charge~.+. _This option cannot be chosen as answer_
@ -242,7 +273,7 @@ This tagrendering is only visible in the popup if the following condition is met
 ### max_bolts

 The question is `How many bolts do routes in {title()} have at most?`
-*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>* is shown if `climbing:bolts:max` is set
+*The sport climbing routes here have at most {climbing:bolts:max} bolts. <div class='subtle'>This is without belay stations and indicates how much quickdraws a climber needs.</div>* is shown if `climbing:bolts:max` is set

 ### Speed climbing?

--- a/Docs/Layers/climbing_route.md
+++ b/Docs/Layers/climbing_route.md
@ -80,7 +80,7 @@ The question is `What is the grade of this climbing route according to the frenc
 ### bolts

 The question is `How many bolts does this route have before reaching the anchor?`
-*This route has {climbing:bolts} bolts <div class='subtle'>This is without relays and indicates how much quickdraws a climber needs</div>* is shown if `climbing:bolts` is set
+*This route has {climbing:bolts} bolts. <div class='subtle'>This is without belay stations and indicates how much quickdraws a climber needs.</div>* is shown if `climbing:bolts` is set

 -  *This route is not bolted* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:climbing:bolted' target='_blank'>climbing:bolted</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:bolted%3Dno' target='_blank'>no</a>

--- a/Docs/Layers/dogfoodb.md
+++ b/Docs/Layers/dogfoodb.md
@ -33,6 +33,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
+  - [drive-through](#drive-through)
+  - [drive-through-opening_hours](#drive-through-opening_hours)
+  - [Drive-through opening hours](#drive-through-opening-hours)
  - [Vegetarian (no friture)](#vegetarian-(no-friture))
  - [Vegan (no friture)](#vegan-(no-friture))
  - [halal (no friture)](#halal-(no-friture))
@ -47,6 +50,7 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [lactose_free](#lactose_free)
  - [smoking](#smoking)
  - [service:electricity](#serviceelectricity)
+  - [seating](#seating)
  - [dog-access](#dog-access)
  - [internet](#internet)
  - [internet-fee](#internet-fee)
@ -89,6 +93,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -272,6 +278,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -413,6 +437,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -527,6 +558,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@ -32,6 +32,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
+  - [drive-through](#drive-through)
+  - [drive-through-opening_hours](#drive-through-opening_hours)
+  - [Drive-through opening hours](#drive-through-opening-hours)
  - [Vegetarian (no friture)](#vegetarian-(no-friture))
  - [Vegan (no friture)](#vegan-(no-friture))
  - [halal (no friture)](#halal-(no-friture))
@ -46,6 +49,7 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [lactose_free](#lactose_free)
  - [smoking](#smoking)
  - [service:electricity](#serviceelectricity)
+  - [seating](#seating)
  - [dog-access](#dog-access)
  - [internet](#internet)
  - [internet-fee](#internet-fee)
@ -104,6 +108,8 @@ Elements must match **any** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -287,6 +293,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -428,6 +452,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -542,6 +573,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Layers/food_glutenfree.md
+++ b/Docs/Layers/food_glutenfree.md
@ -34,6 +34,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
+  - [drive-through](#drive-through)
+  - [drive-through-opening_hours](#drive-through-opening_hours)
+  - [Drive-through opening hours](#drive-through-opening-hours)
  - [Vegetarian (no friture)](#vegetarian-(no-friture))
  - [Vegan (no friture)](#vegan-(no-friture))
  - [halal (no friture)](#halal-(no-friture))
@ -47,6 +50,7 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [lactose_free](#lactose_free)
  - [smoking](#smoking)
  - [service:electricity](#serviceelectricity)
+  - [seating](#seating)
  - [dog-access](#dog-access)
  - [internet](#internet)
  - [internet-fee](#internet-fee)
@ -91,6 +95,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -285,6 +291,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -414,6 +438,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -528,6 +559,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Layers/food_lactosefree.md
+++ b/Docs/Layers/food_lactosefree.md
@ -34,6 +34,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
+  - [drive-through](#drive-through)
+  - [drive-through-opening_hours](#drive-through-opening_hours)
+  - [Drive-through opening hours](#drive-through-opening-hours)
  - [Vegetarian (no friture)](#vegetarian-(no-friture))
  - [Vegan (no friture)](#vegan-(no-friture))
  - [halal (no friture)](#halal-(no-friture))
@ -47,6 +50,7 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [gluten_free](#gluten_free)
  - [smoking](#smoking)
  - [service:electricity](#serviceelectricity)
+  - [seating](#seating)
  - [dog-access](#dog-access)
  - [internet](#internet)
  - [internet-fee](#internet-fee)
@ -91,6 +95,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -285,6 +291,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -414,6 +438,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -528,6 +559,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@ -33,6 +33,9 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [Reservation](#reservation)
  - [Takeaway](#takeaway)
  - [delivery](#delivery)
+  - [drive-through](#drive-through)
+  - [drive-through-opening_hours](#drive-through-opening_hours)
+  - [Drive-through opening hours](#drive-through-opening-hours)
  - [Vegetarian (no friture)](#vegetarian-(no-friture))
  - [Vegan (no friture)](#vegan-(no-friture))
  - [halal (no friture)](#halal-(no-friture))
@ -47,6 +50,7 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
  - [lactose_free](#lactose_free)
  - [smoking](#smoking)
  - [service:electricity](#serviceelectricity)
+  - [seating](#seating)
  - [dog-access](#dog-access)
  - [internet](#internet)
  - [internet-fee](#internet-fee)
@ -89,6 +93,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -272,6 +278,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -413,6 +437,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -527,6 +558,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Layers/insect_hotel.md
+++ b/Docs/Layers/insect_hotel.md
@ -0,0 +1,70 @@
+[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
+
+# insect_hotel
+
+Layer showing insect hotels
+
+ - This layer is shown at zoomlevel **11** and higher
+
+## Table of contents
+
+1. [Themes using this layer](#themes-using-this-layer)
+2. [Presets](#presets)
+3. [Basic tags for this layer](#basic-tags-for-this-layer)
+4. [Supported attributes](#supported-attributes)
+  - [images](#images)
+  - [leftover-questions](#leftover-questions)
+  - [move-button](#move-button)
+  - [delete-button](#delete-button)
+  - [lod](#lod)
+
+## Themes using this layer
+
+ - [insects](https://mapcomplete.org/insects)
+ - [nature](https://mapcomplete.org/nature)
+ - [personal](https://mapcomplete.org/personal)
+
+## Presets
+
+The following options to create new points are included:
+
+ - **an insect hotel** which has the following tags:<a href='https://wiki.openstreetmap.org/wiki/Key:man_made' target='_blank'>man_made</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dinsect_hotel' target='_blank'>insect_hotel</a>
+
+## Basic tags for this layer
+
+Elements must match the expression **<a href='https://wiki.openstreetmap.org/wiki/Key:man_made' target='_blank'>man_made</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:man_made%3Dinsect_hotel' target='_blank'>insect_hotel</a>**
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22man_made%22%3D%22insect_hotel%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+## Supported attributes
+
+### images
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images
+_This tagrendering has no question and is thus read-only_
+*{image_carousel()}{image_upload()}*
+
+### leftover-questions
+
+_This tagrendering has no question and is thus read-only_
+*{questions( ,)}*
+
+### move-button
+
+_This tagrendering has no question and is thus read-only_
+*{move_button()}*
+
+### delete-button
+
+_This tagrendering has no question and is thus read-only_
+*{delete_button()}*
+
+### lod
+
+_This tagrendering has no question and is thus read-only_
+*{linked_data_from_website()}*
+
+This tagrendering has labels 
+`added_by_default`
+
+
+This document is autogenerated from [assets/layers/insect_hotel/insect_hotel.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/insect_hotel/insect_hotel.json)
--- a/Docs/Layers/note.md
+++ b/Docs/Layers/note.md
@ -58,7 +58,7 @@ _This tagrendering has no question and is thus read-only_
 ### nearby-images

 _This tagrendering has no question and is thus read-only_
-*<h3>Nearby images</h3>The pictures below are nearby geotagged images and might be helpful to handle this note.{nearby_images(open,)}*
+*<h3>Nearby images</h3>The pictures below are nearby geotagged images and might be helpful to handle this note.{nearby_images(open,yes)}*

 ### report-contributor

--- a/Docs/Layers/parking.md
+++ b/Docs/Layers/parking.md
@ -18,6 +18,7 @@ A layer showing car parkings
  - [parking-type](#parking-type)
  - [capacity-disabled](#capacity-disabled)
  - [capacity](#capacity)
+  - [maxstay](#maxstay)
  - [leftover-questions](#leftover-questions)
  - [move-button](#move-button)
  - [delete-button](#delete-button)
@ -52,6 +53,7 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/parking#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/parking/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [parking](https://wiki.openstreetmap.org/wiki/Key:parking) | Multiple choice | [surface](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dsurface) [street_side](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dstreet_side) [underground](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dunderground) [multi-storey](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dmulti-storey) [rooftop](https://wiki.openstreetmap.org/wiki/Tag:parking%3Drooftop) [lane](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dlane) [carports](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dcarports) [garage_boxes](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dgarage_boxes) [layby](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dlayby) [sheds](https://wiki.openstreetmap.org/wiki/Tag:parking%3Dsheds) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:disabled#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Adisabled/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:disabled](https://wiki.openstreetmap.org/wiki/Key:capacity:disabled) | [pnat](../SpecialInputElements.md#pnat) | [0](https://wiki.openstreetmap.org/wiki/Tag:capacity:disabled%3D0) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity](https://wiki.openstreetmap.org/wiki/Key:capacity) | [pnat](../SpecialInputElements.md#pnat) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/maxstay#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/maxstay/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [maxstay](https://wiki.openstreetmap.org/wiki/Key:maxstay) | [pfloat](../SpecialInputElements.md#pfloat) | [unlimited](https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited) |

 ### 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
@ -110,6 +112,13 @@ The question is `How many disabled parking spots are there at this parking?`
 The question is `How many parking spots are there at this parking?`
 *There are {capacity} parking spots* is shown if `capacity` is set

+### maxstay
+
+The question is `What is the maximum amount of time one is allowed to stay here?`
+*One can stay at most <b>{canonical(maxstay)}</b>* is shown if `maxstay` is set
+
+ -  *There is no limit to the amount of time one can stay here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>
+
 ### leftover-questions

 _This tagrendering has no question and is thus read-only_
--- a/Docs/Layers/parks_without_etymology.md
+++ b/Docs/Layers/parks_without_etymology.md
@ -0,0 +1,110 @@
+[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
+
+# parks_without_etymology
+
+This layer is based on [etymology](../Layers/etymology.md)
+
+All objects which have an etymology known
+
+ - This layer is shown at zoomlevel **18** and higher
+
+## Table of contents
+
+1. [Themes using this layer](#themes-using-this-layer)
+2. [Basic tags for this layer](#basic-tags-for-this-layer)
+3. [Supported attributes](#supported-attributes)
+  - [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
+  - [wikipedia-etymology](#wikipedia-etymology)
+  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
+  - [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
+  - [simple etymology](#simple-etymology)
+  - [questions](#questions)
+  - [street-name-sign-image](#street-name-sign-image)
+  - [minimap](#minimap)
+  - [etymology_multi_apply](#etymology_multi_apply)
+  - [wikipedia](#wikipedia)
+  - [lod](#lod)
+
+## Themes using this layer
+
+ - [etymology](https://mapcomplete.org/etymology)
+
+## Basic tags for this layer
+
+Elements must match **all** of the following expressions:
+
+0. <a href='https://wiki.openstreetmap.org/wiki/Key:landuse' target='_blank'>landuse</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:landuse%3Dvillage_green' target='_blank'>village_green</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:landuse' target='_blank'>landuse</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:landuse%3Drecreation_ground' target='_blank'>recreation_ground</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dpark' target='_blank'>park</a>
+1. name~.+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22landuse%22%3D%22village_green%22%5D%5B%22name%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22landuse%22%3D%22recreation_ground%22%5D%5B%22name%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22leisure%22%3D%22park%22%5D%5B%22name%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+## Supported attributes
+
+**Warning:**,this quick overview is incomplete,
+
+| attribute | type | values which are supported by this layer |
+-----|-----|----- |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name:etymology:wikidata#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name%3Aetymology%3Awikidata/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name:etymology:wikidata](https://wiki.openstreetmap.org/wiki/Key:name:etymology:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name:etymology#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name%3Aetymology/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name:etymology](https://wiki.openstreetmap.org/wiki/Key:name:etymology) | [text](../SpecialInputElements.md#text) | [unknown](https://wiki.openstreetmap.org/wiki/Tag:name:etymology%3Dunknown) |
+
+### etymology-images-from-wikipedia
+
+_This tagrendering has no question and is thus read-only_
+*{image_carousel(name:etymology:wikidata)}*
+
+### wikipedia-etymology
+
+The question is `What is the Wikidata-item that this object is named after?`
+*<h3>Wikipedia article of the name giver</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}* is shown if `name:etymology:wikidata` is set
+
+### zoeken op inventaris onroerend erfgoed
+
+_This tagrendering has no question and is thus read-only_
+*<a href='https://inventaris.onroerenderfgoed.be/erfgoedobjecten?tekst={name}' target='_blank'>Search on inventaris onroerend erfgoed</a>*
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:_country' target='_blank'>_country</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:_country%3Dbe' target='_blank'>be</a>
+
+### simple etymology
+
+The question is `What is this object named after?`
+*Named after {name:etymology}* is shown if `name:etymology` is set
+
+ -  *The origin of this name is unknown in all literature* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:name:etymology' target='_blank'>name:etymology</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:name:etymology%3Dunknown' target='_blank'>unknown</a>
+
+### questions
+Show the questions block at this location
+_This tagrendering has no question and is thus read-only_
+*{questions()}*
+
+### street-name-sign-image
+
+_This tagrendering has no question and is thus read-only_
+*{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Add image of a street name sign)}*
+
+### minimap
+
+_This tagrendering has no question and is thus read-only_
+*{minimap(18, id, _same_name_ids):height:10rem}*
+
+### etymology_multi_apply
+
+_This tagrendering has no question and is thus read-only_
+*{multi_apply(_same_name_ids, name:etymology:wikidata;name:etymology, Auto-applying data on all segments with the same name, true)}*
+
+### wikipedia
+
+_This tagrendering has no question and is thus read-only_
+*A Wikipedia article about this <b>street</b> exists:<br/>{wikipedia():max-height:25rem}*
+
+This tagrendering is only visible in the popup if the following condition is met: wikidata~.+
+
+### lod
+
+_This tagrendering has no question and is thus read-only_
+*{linked_data_from_website()}*
+
+This tagrendering has labels 
+`added_by_default`
+
+
+This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
--- a/Docs/Layers/sports_centre.md
+++ b/Docs/Layers/sports_centre.md
@ -138,7 +138,7 @@ The question is `What sports are played at this venue?`
 -  *Canoe* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dcanoe' target='_blank'>canoe</a>
 -  *Chess* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dchess' target='_blank'>chess</a>
 -  *Non-competitive diving* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dcliff_diving' target='_blank'>cliff_diving</a>
- -  *Rock climbing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing' target='_blank'>climbing</a>
+ -  *Climbing* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing' target='_blank'>climbing</a>
 -  *Climbing Adventure* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing_adventure' target='_blank'>climbing_adventure</a>
 -  *Cockfighting* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dcockfighting' target='_blank'>cockfighting</a>
 -  *Cricket* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dcricket' target='_blank'>cricket</a>
--- a/Docs/Layers/stairs.md
+++ b/Docs/Layers/stairs.md
@ -42,7 +42,7 @@ Elements must match the expression **<a href='https://wiki.openstreetmap.org/wik
 | attribute | type | values which are supported by this layer |
 -----|-----|----- |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [string](../SpecialInputElements.md#string) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/conveying#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/conveying/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [conveying](https://wiki.openstreetmap.org/wiki/Key:conveying) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/conveying#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/conveying/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [conveying](https://wiki.openstreetmap.org/wiki/Key:conveying) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dyes) [reversible](https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dreversible) [no](https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/handrail#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/handrail/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [handrail](https://wiki.openstreetmap.org/wiki/Key:handrail) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:handrail%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:handrail%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/tactile_writing#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/tactile_writing/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [tactile_writing](https://wiki.openstreetmap.org/wiki/Key:tactile_writing) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:tactile_writing%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:tactile_writing%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/incline#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/incline/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [incline](https://wiki.openstreetmap.org/wiki/Key:incline) | [slope](../SpecialInputElements.md#slope) |  |
@ -65,9 +65,11 @@ The question is `Between which levels are these stairs?`

 ### conveying

-_This tagrendering has no question and is thus read-only_
+The question is `Is this an escalator?`

 -  *This is an escalator* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:conveying' target='_blank'>conveying</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dyes' target='_blank'>yes</a>
+ -  *This is an escalator moving in the direction of the arrows* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:conveying' target='_blank'>conveying</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dforward' target='_blank'>forward</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:conveying' target='_blank'>conveying</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dbackward' target='_blank'>backward</a>. _This option cannot be chosen as answer_
+ -  *This is a reversible escalator* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:conveying' target='_blank'>conveying</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dreversible' target='_blank'>reversible</a>
 -  *This is not an escalator* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:conveying' target='_blank'>conveying</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:conveying%3Dno' target='_blank'>no</a>
 -  *This is not an escalator* is shown if with conveying=. _This option cannot be chosen as answer_

--- a/Docs/Layers/tree_node.md
+++ b/Docs/Layers/tree_node.md
@ -32,6 +32,7 @@ A layer showing trees

 ## Themes using this layer

+ - [nature](https://mapcomplete.org/nature)
 - [personal](https://mapcomplete.org/personal)
 - [trees](https://mapcomplete.org/trees)

--- a/Docs/ServerConfig/hetzner/Caddyfile
+++ b/Docs/ServerConfig/hetzner/Caddyfile
@ -1,4 +1,4 @@
-hosted.mapcomplete.org {
+builds.mapcomplete.org {
 	root * public/
 	file_server
 	header {
@ -6,6 +6,31 @@ hosted.mapcomplete.org {
 	}
 }

+dev.mapcomplete.org {
+	root * public/develop/
+	file_server
+	header {
+		+Permissions-Policy "interest-cohort=()"
+	}
+}
+
+single.mapcomplete.org {
+	root * single_theme_builds/
+	file_server
+	header {
+		+Permissions-Policy "interest-cohort=()"
+	}
+}
+
+
+velopark.mapcomplete.org {
+	root * single_theme_builds/velopark/
+	file_server
+	header {
+		+Permissions-Policy "interest-cohort=()"
+	}
+}
+
 app.mapcomplete.org {
 	root * app/
 	file_server
@ -19,7 +44,7 @@ countrycoder.mapcomplete.org {
 	file_server
 	header {
 		+Permissions-Policy "interest-cohort=()"
-		+Access-Control-Allow-Origin https://hosted.mapcomplete.org https://dev.mapcomplete.org https://mapcomplete.org
+		+Access-Control-Allow-Origin *
 	}
 }

@ -36,5 +61,5 @@ lod.mapcomplete.org {
 }

 ipinfo.mapcomplete.org {
-    reverse_proxy 127.0.0.1:2347
+	reverse_proxy 127.0.0.1:2347
 }
--- a/Docs/SettingUpPSQL.md
+++ b/Docs/SettingUpPSQL.md
@ -67,8 +67,10 @@ pg_tileserv can be downloaded here: https://github.com/CrunchyData/pg_tileserv

 In the directory where it is downloaded (e.g. `~/data`), run

+First, look up the latest suitable database on https://mapcomplete.org/status
+
 ````
-export DATABASE_URL=postgresql://user:password@localhost:5444/osm-poi
+export DATABASE_URL=postgresql://user:password@localhost:5444/osm-poi.{date-of-suitable-database}
 nohup ./pg_tileserv >> pg_tileserv.log &
 ````

@ -84,7 +86,19 @@ map.addSource("drinking_water", {

 `npm run summary-server` in the git repo

+# Connecting to the database
+
+Setup the SSH-tunnel:
+
+`ssh folky.me
+ssh -L 5444:127.0.0.1:5444 lain`
+
+Open a second terminal:
+
+`ssh -L 5444:127.0.0.1:5444 folky.me` `
+
+Connect pgAdmin
+
 # Rebooting:

 -> Restart the docker container
-> 
--- a/Docs/SpecialRenderings.md
+++ b/Docs/SpecialRenderings.md
@ -426,10 +426,11 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
 | max_snap_distance | 5 | The maximum distance that the imported point will be moved to snap onto a way in an already existing layer (in meters). This is previewed to the contributor, similar to the 'add new point'-action of MapComplete |
 | note_id | _undefined_ | If given, this key will be read. The corresponding note on OSM will be closed, stating 'imported' |
 | maproulette_id | _undefined_ | The property name of the maproulette_id - this is probably `mr_taskId`. If given, the maproulette challenge will be marked as fixed. Only use this if part of a maproulette-layer. |
+| to_point | _undefined_ | If set, a feature will be converted to a centerpoint |

 #### Example usage of import_button

-<code>`{import_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,,5,,)}`</code>
+<code>`{import_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,,5,,,)}`</code>

 ### import_way_button

@ -559,7 +560,7 @@ A component showing nearby images loaded from various online services such as Ma
 | name | default | description |
 -----|-----|----- |
 | mode | closed | Either `open` or `closed`. If `open`, then the image carousel will always be shown |
-| readonly | _undefined_ | If 'readonly', will not show the 'link'-button |
+| readonly | _undefined_ | If 'readonly' or 'yes', will not show the 'link'-button |

 #### Example usage of nearby_images

--- a/Docs/TagInfo/mapcomplete_blind_osm.json
+++ b/Docs/TagInfo/mapcomplete_blind_osm.json
@ -1289,17 +1289,32 @@
    },
    {
      "key": "conveying",
-      "description": "Layer 'Stairs' shows conveying=yes with a fixed text, namely 'This is an escalator' (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Stairs' shows conveying=yes with a fixed text, namely 'This is an escalator' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
      "value": "yes"
    },
    {
      "key": "conveying",
-      "description": "Layer 'Stairs' shows conveying=no with a fixed text, namely 'This is not an escalator' (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Stairs' shows conveying=forward | conveying=backward with a fixed text, namely 'This is an escalator moving in the direction of the arrows' (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "forward"
+    },
+    {
+      "key": "conveying",
+      "description": "Layer 'Stairs' shows conveying=forward | conveying=backward with a fixed text, namely 'This is an escalator moving in the direction of the arrows' (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "backward"
+    },
+    {
+      "key": "conveying",
+      "description": "Layer 'Stairs' shows conveying=reversible with a fixed text, namely 'This is a reversible escalator' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "reversible"
+    },
+    {
+      "key": "conveying",
+      "description": "Layer 'Stairs' shows conveying=no with a fixed text, namely 'This is not an escalator' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
      "value": "no"
    },
    {
      "key": "conveying",
-      "description": "Layer 'Stairs' shows conveying= with a fixed text, namely 'This is not an escalator' (in the mapcomplete.org theme 'OSM for the blind')",
+      "description": "Layer 'Stairs' shows conveying= with a fixed text, namely 'This is not an escalator' (in the mapcomplete.org theme 'OSM for the blind') Picking this answer will delete the key conveying.",
      "value": ""
    },
    {
--- a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
+++ b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
@ -229,6 +229,16 @@
      "description": "Layer 'Cafés and pubs' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Cafés and pubs' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Cafés and pubs' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Cafés and pubs' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cafés and pubs')",
--- a/Docs/TagInfo/mapcomplete_charging_stations.json
+++ b/Docs/TagInfo/mapcomplete_charging_stations.json
@ -1246,11 +1246,11 @@
    },
    {
      "key": "maxstay",
-      "description": "Layer 'Charging stations' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Charging stations') (This is only shown if maxstay~.+ | motorcar=yes | hgv=yes | bus=yes)"
+      "description": "Layer 'Charging stations' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Charging stations') (This is only shown if motorcar=yes | hgv=yes | bus=yes)"
    },
    {
      "key": "maxstay",
-      "description": "Layer 'Charging stations' shows maxstay=unlimited with a fixed text, namely 'No timelimit on leaving your vehicle here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Charging stations') (This is only shown if maxstay~.+ | motorcar=yes | hgv=yes | bus=yes)",
+      "description": "Layer 'Charging stations' shows maxstay=unlimited with a fixed text, namely 'There is no limit to the amount of time one can stay here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Charging stations') (This is only shown if motorcar=yes | hgv=yes | bus=yes)",
      "value": "unlimited"
    },
    {
--- a/Docs/TagInfo/mapcomplete_climbing.json
+++ b/Docs/TagInfo/mapcomplete_climbing.json
@ -112,6 +112,11 @@
      "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Climbing gyms showing features with this tag",
      "value": "sports_centre"
    },
+    {
+      "key": "leisure",
+      "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Climbing gyms showing features with this tag",
+      "value": "sports_hall"
+    },
    {
      "key": "id",
      "description": "Layer 'Climbing gyms' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
@ -294,65 +299,108 @@
    },
    {
      "key": "service:climbing_harness:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:fee=no with a fixed text, namely 'A climbing harness can be borrowed for free 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 | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:fee=no with a fixed text, namely 'A climbing harness can be borrowed for free 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~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no) | (climbing:speed~.+ & climbing:speed!=no))",
      "value": "yes"
    },
    {
      "key": "service:climbing_harness:rental:fee",
-      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:fee=no with a fixed text, namely 'A climbing harness can be borrowed for free 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 | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:fee=no with a fixed text, namely 'A climbing harness can be borrowed for free 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~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no) | (climbing:speed~.+ & climbing:speed!=no))",
      "value": "no"
    },
    {
      "key": "service:climbing_harness:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:charge~.+ with a fixed text, namely 'A climbing harness can be rented here for {service:climbing_harness:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:charge~.+ with a fixed text, namely 'A climbing harness can be rented here for {service:climbing_harness:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no) | (climbing:speed~.+ & climbing:speed!=no))",
      "value": "yes"
    },
    {
      "key": "service:climbing_harness:rental:charge",
-      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:charge~.+ with a fixed text, namely 'A climbing harness can be rented here for {service:climbing_harness:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no | climbing:toprope!=no)"
+      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes & service:climbing_harness:rental:charge~.+ with a fixed text, namely 'A climbing harness can be rented here for {service:climbing_harness:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no) | (climbing:speed~.+ & climbing:speed!=no))"
    },
    {
      "key": "service:climbing_harness:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes with a fixed text, namely 'A climbing harness can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=yes with a fixed text, namely 'A climbing harness can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no) | (climbing:speed~.+ & climbing:speed!=no))",
      "value": "yes"
    },
    {
      "key": "service:climbing_harness:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=no with a fixed text, namely 'A climbing harness 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 | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_harness:rental=no with a fixed text, namely 'A climbing harness 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~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no) | (climbing:speed~.+ & climbing:speed!=no))",
      "value": "no"
    },
+    {
+      "key": "climbing:autobelay:toprope",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:autobelay:toprope' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:toprope~.+ & climbing:toprope!=no)"
+    },
+    {
+      "key": "climbing:autobelay:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:autobelay:toprope=no with a fixed text, namely 'There are no auto belays for top roping' 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:toprope~.+ & climbing:toprope!=no)",
+      "value": "no"
+    },
+    {
+      "key": "climbing:autobelay:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:autobelay:toprope=yes with a fixed text, namely 'There are a number of auto belays for top roping' 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:toprope~.+ & climbing:toprope!=no)",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:autobelay:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:autobelay:toprope=all with a fixed text, namely 'There is an auto belay for every top rope route but manual belaying is also possible' 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:toprope~.+ & climbing:toprope!=no)",
+      "value": "all"
+    },
+    {
+      "key": "climbing:autobelay:toprope",
+      "description": "Layer 'Climbing gyms' shows climbing:autobelay:toprope=only with a fixed text, namely 'Top rope routes can only be climbed on auto belay' 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:toprope~.+ & climbing:toprope!=no)",
+      "value": "only"
+    },
+    {
+      "key": "climbing:autobelay:sport",
+      "description": "Layer 'Climbing gyms' shows and asks freeform values for key 'climbing:autobelay:sport' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport~.+ & climbing:sport!=no)"
+    },
+    {
+      "key": "climbing:autobelay:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:autobelay:sport=no with a fixed text, namely 'There are no auto belays for lead climbing' 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~.+ & climbing:sport!=no)",
+      "value": "no"
+    },
+    {
+      "key": "climbing:autobelay:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:autobelay:sport=yes with a fixed text, namely 'There is a number of auto belays for lead climbing' 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~.+ & climbing:sport!=no)",
+      "value": "yes"
+    },
+    {
+      "key": "climbing:autobelay:sport",
+      "description": "Layer 'Climbing gyms' shows climbing:autobelay:sport=all with a fixed text, namely 'There is an auto belay for every lead climbing route' 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~.+ & climbing:sport!=no)",
+      "value": "all"
+    },
    {
      "key": "service:climbing_belay_device:provided_at_each_rope",
-      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:provided_at_each_rope=yes with a fixed text, namely 'Belay devices are provided at each rope' 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 | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:provided_at_each_rope=yes with a fixed text, namely 'Belay devices are provided at each rope' 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~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no))",
      "value": "yes"
    },
    {
      "key": "service:climbing_belay_device:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:fee=no with a fixed text, namely 'A belay device can be borrowed for free 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 | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:fee=no with a fixed text, namely 'A belay device can be borrowed for free 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~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no))",
      "value": "yes"
    },
    {
      "key": "service:climbing_belay_device:rental:fee",
-      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:fee=no with a fixed text, namely 'A belay device can be borrowed for free 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 | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:fee=no with a fixed text, namely 'A belay device can be borrowed for free 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~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no))",
      "value": "no"
    },
    {
      "key": "service:climbing_belay_device:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:charge~.+ with a fixed text, namely 'A belay device can be rented here for {service:climbing_belay_device:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:charge~.+ with a fixed text, namely 'A belay device can be rented here for {service:climbing_belay_device:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no))",
      "value": "yes"
    },
    {
      "key": "service:climbing_belay_device:rental:charge",
-      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:charge~.+ with a fixed text, namely 'A belay device can be rented here for {service:climbing_belay_device:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no | climbing:toprope!=no)"
+      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes & service:climbing_belay_device:rental:charge~.+ with a fixed text, namely 'A belay device can be rented here for {service:climbing_belay_device:rental:charge}' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no))"
    },
    {
      "key": "service:climbing_belay_device:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes with a fixed text, namely 'A belay device can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if climbing:sport!=no | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=yes with a fixed text, namely 'A belay device can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if (climbing:sport~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no))",
      "value": "yes"
    },
    {
      "key": "service:climbing_belay_device:rental",
-      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=no with a fixed text, namely 'A belay device 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 | climbing:toprope!=no)",
+      "description": "Layer 'Climbing gyms' shows service:climbing_belay_device:rental=no with a fixed text, namely 'A belay device 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~.+ & climbing:sport!=no) | (climbing:toprope~.+ & climbing:toprope!=no))",
      "value": "no"
    },
    {
--- a/Docs/TagInfo/mapcomplete_cyclofix.json
+++ b/Docs/TagInfo/mapcomplete_cyclofix.json
@ -287,6 +287,11 @@
      "description": "The MapComplete theme Cyclofix - a map for cyclists has a layer Bike repair/shop showing features with this tag",
      "value": "yes"
    },
+    {
+      "key": "service:bicycle:second_hand",
+      "description": "The MapComplete theme Cyclofix - a map for cyclists has a layer Bike repair/shop showing features with this tag",
+      "value": "yes"
+    },
    {
      "key": "shop",
      "description": "The MapComplete theme Cyclofix - a map for cyclists has a layer Bike repair/shop showing features with this tag",
@ -4123,11 +4128,11 @@
    },
    {
      "key": "maxstay",
-      "description": "Layer 'Charging stations' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if maxstay~.+ | motorcar=yes | hgv=yes | bus=yes)"
+      "description": "Layer 'Charging stations' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if motorcar=yes | hgv=yes | bus=yes)"
    },
    {
      "key": "maxstay",
-      "description": "Layer 'Charging stations' shows maxstay=unlimited with a fixed text, namely 'No timelimit on leaving your vehicle 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 maxstay~.+ | motorcar=yes | hgv=yes | bus=yes)",
+      "description": "Layer 'Charging stations' shows maxstay=unlimited with a fixed text, namely 'There is no limit to the amount of time one can stay 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 motorcar=yes | hgv=yes | bus=yes)",
      "value": "unlimited"
    },
    {
--- a/Docs/TagInfo/mapcomplete_etymology.json
+++ b/Docs/TagInfo/mapcomplete_etymology.json
@ -615,6 +615,82 @@
    {
      "key": "wikipedia",
      "description": "The layer 'Sport places without etymology information allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "name",
+      "description": "The MapComplete theme Etymology - what is a place named after? has a layer Parks without etymology information showing features with this tag"
+    },
+    {
+      "key": "leisure",
+      "description": "The MapComplete theme Etymology - what is a place named after? has a layer Parks without etymology information showing features with this tag",
+      "value": "park"
+    },
+    {
+      "key": "landuse",
+      "description": "The MapComplete theme Etymology - what is a place named after? has a layer Parks without etymology information showing features with this tag",
+      "value": "village_green"
+    },
+    {
+      "key": "landuse",
+      "description": "The MapComplete theme Etymology - what is a place named after? has a layer Parks without etymology information showing features with this tag",
+      "value": "recreation_ground"
+    },
+    {
+      "key": "id",
+      "description": "Layer 'Parks without etymology information' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Etymology - what is a place named after?') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Parks without etymology information shows images based on the keys image, image:0, image:1,..., panoramax, panoramax:0, panoramx:1, ... ,  wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "panoramax",
+      "description": "The layer 'Parks without etymology information shows images based on the keys image, image:0, image:1,..., panoramax, panoramax:0, panoramx:1, ... ,  wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Parks without etymology information shows images based on the keys image, image:0, image:1,..., panoramax, panoramax:0, panoramx:1, ... ,  wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Parks without etymology information shows images based on the keys image, image:0, image:1,..., panoramax, panoramax:0, panoramx:1, ... ,  wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Parks without etymology information shows images based on the keys image, image:0, image:1,..., panoramax, panoramax:0, panoramx:1, ... ,  wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "name:etymology:wikidata",
+      "description": "Layer 'Parks without etymology information' shows and asks freeform values for key 'name:etymology:wikidata' (in the mapcomplete.org theme 'Etymology - what is a place named after?') (This is only shown if name:etymology!=unknown)"
+    },
+    {
+      "key": "name:etymology",
+      "description": "Layer 'Parks without etymology information' shows and asks freeform values for key 'name:etymology' (in the mapcomplete.org theme 'Etymology - what is a place named after?') (This is only shown if name:etymology~.+ | name:etymology:wikidata=)"
+    },
+    {
+      "key": "name:etymology",
+      "description": "Layer 'Parks without etymology information' shows name:etymology=unknown with a fixed text, namely 'The origin of this name is unknown in all literature' and allows to pick this as a default answer (in the mapcomplete.org theme 'Etymology - what is a place named after?') (This is only shown if name:etymology~.+ | name:etymology:wikidata=)",
+      "value": "unknown"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Parks without etymology information allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "panoramax",
+      "description": "The layer 'Parks without etymology information allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Parks without etymology information allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Parks without etymology information allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Parks without etymology information allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
    }
  ]
 }
--- a/Docs/TagInfo/mapcomplete_fireplace.json
+++ b/Docs/TagInfo/mapcomplete_fireplace.json
@ -115,62 +115,62 @@
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=yes with a fixed text, namely 'Public' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows access=yes with a fixed text, namely 'This barbecue can be used by anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "yes"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=no with a fixed text, namely 'No access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows access=no with a fixed text, namely 'This barbecue can't be used by anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "no"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=private with a fixed text, namely 'Private' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows access=private with a fixed text, namely 'This barbecue is private' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "private"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=permissive with a fixed text, namely 'Access until revoked' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows access=permissive with a fixed text, namely 'This barbecue can be used by anyone, but the owner can revoke access at any time' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "permissive"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=customers with a fixed text, namely 'Access only for customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows access=customers with a fixed text, namely 'This barbecue can only be used by customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "customers"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=permit with a fixed text, namely 'Access only for authorized persons' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows access=permit with a fixed text, namely 'This barbecue can only be used by authorized persons' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "permit"
    },
    {
      "key": "covered",
-      "description": "Layer 'BBQ' shows covered=no with a fixed text, namely 'The grill is not covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows covered=no with a fixed text, namely 'This barbecue is not covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "no"
    },
    {
      "key": "covered",
-      "description": "Layer 'BBQ' shows covered=yes with a fixed text, namely 'The grill is covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows covered=yes with a fixed text, namely 'This barbecue is covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "yes"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=wood with a fixed text, namely 'Wood' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows fuel=wood with a fixed text, namely 'This barbecue uses wood as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "wood"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=charcoal with a fixed text, namely 'Charcoal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows fuel=charcoal with a fixed text, namely 'This barbecue uses charcoal as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "charcoal"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=electric with a fixed text, namely 'Electric' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows fuel=electric with a fixed text, namely 'This barbecue is powered by electricity' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "electric"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=gas with a fixed text, namely 'Gas' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
+      "description": "Layer 'BBQ' shows fuel=gas with a fixed text, namely 'This barbecue uses gas as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fireplaces and barbeques')",
      "value": "gas"
    }
  ]
--- a/Docs/TagInfo/mapcomplete_food.json
+++ b/Docs/TagInfo/mapcomplete_food.json
@ -347,6 +347,25 @@
      "description": "Layer 'Restaurants and fast food' shows delivery=no with a fixed text, namely 'This business does not deliver at home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
      "value": "no"
    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=yes with a fixed text, namely 'This fast-food restaurant has a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if amenity=fast_food)",
+      "value": "yes"
+    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=no with a fixed text, namely 'This fast-food restaurant does not have a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if amenity=fast_food)",
+      "value": "no"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'opening_hours:drive_through' (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if drive_through=yes)"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows opening_hours:drive_through= with a fixed text, namely 'The opening hours of the drive-through are the same as the restaurant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') Picking this answer will delete the key opening_hours:drive_through. (This is only shown if drive_through=yes)",
+      "value": ""
+    },
    {
      "key": "diet:vegetarian",
      "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=no with a fixed text, namely 'No vegetarian options are available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food') (This is only shown if cuisine!=friture)",
@ -607,6 +626,16 @@
      "description": "Layer 'Restaurants and fast food' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Restaurants and fast food' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
--- a/Docs/TagInfo/mapcomplete_fritures.json
+++ b/Docs/TagInfo/mapcomplete_fritures.json
@ -351,6 +351,25 @@
      "description": "Layer 'Fries shop' shows delivery=no with a fixed text, namely 'This business does not deliver at home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
      "value": "no"
    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Fries shop' shows drive_through=yes with a fixed text, namely 'This fast-food restaurant has a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops') (This is only shown if amenity=fast_food)",
+      "value": "yes"
+    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Fries shop' shows drive_through=no with a fixed text, namely 'This fast-food restaurant does not have a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops') (This is only shown if amenity=fast_food)",
+      "value": "no"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Fries shop' shows and asks freeform values for key 'opening_hours:drive_through' (in the mapcomplete.org theme 'Fries shops') (This is only shown if drive_through=yes)"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Fries shop' shows opening_hours:drive_through= with a fixed text, namely 'The opening hours of the drive-through are the same as the restaurant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops') Picking this answer will delete the key opening_hours:drive_through. (This is only shown if drive_through=yes)",
+      "value": ""
+    },
    {
      "key": "diet:vegetarian",
      "description": "Layer 'Fries shop' shows diet:vegetarian=no with a fixed text, namely 'No vegetarian options are available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops') (This is only shown if cuisine!=friture)",
@ -611,6 +630,16 @@
      "description": "Layer 'Fries shop' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Fries shop' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Fries shop' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Fries shop' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
--- a/Docs/TagInfo/mapcomplete_glutenfree.json
+++ b/Docs/TagInfo/mapcomplete_glutenfree.json
@ -371,6 +371,25 @@
      "description": "Layer 'Restaurants and fast food' shows delivery=no with a fixed text, namely 'This business does not deliver at home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
      "value": "no"
    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=yes with a fixed text, namely 'This fast-food restaurant has a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if amenity=fast_food)",
+      "value": "yes"
+    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=no with a fixed text, namely 'This fast-food restaurant does not have a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if amenity=fast_food)",
+      "value": "no"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'opening_hours:drive_through' (in the mapcomplete.org theme 'Glutenfree') (This is only shown if drive_through=yes)"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows opening_hours:drive_through= with a fixed text, namely 'The opening hours of the drive-through are the same as the restaurant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') Picking this answer will delete the key opening_hours:drive_through. (This is only shown if drive_through=yes)",
+      "value": ""
+    },
    {
      "key": "diet:vegetarian",
      "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=no with a fixed text, namely 'No vegetarian options are available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree') (This is only shown if cuisine!=friture)",
@ -611,6 +630,16 @@
      "description": "Layer 'Restaurants and fast food' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Restaurants and fast food' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
--- a/Docs/TagInfo/mapcomplete_insects.json
+++ b/Docs/TagInfo/mapcomplete_insects.json
@ -0,0 +1,81 @@
+{
+  "data_format": 1,
+  "project": {
+    "name": "MapComplete Insect Hotels",
+    "description": "Insect hotels provide shelter for insects",
+    "project_url": "https://mapcomplete.org/insects",
+    "doc_url": "https://github.com/pietervdvn/MapComplete/tree/master/assets/themes/",
+    "icon_url": "https://mapcomplete.org/assets/layers/insect_hotel/insect_hotel.svg",
+    "contact_name": "Pieter Vander Vennet",
+    "contact_email": "pietervdvn@posteo.net"
+  },
+  "tags": [
+    {
+      "key": "man_made",
+      "description": "The MapComplete theme Insect Hotels has a layer Insect Hotels showing features with this tag",
+      "value": "insect_hotel"
+    },
+    {
+      "key": "id",
+      "description": "Layer 'Insect Hotels' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Insect Hotels') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "panoramax",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "man_made",
+      "description": "The MapComplete theme Insect Hotels has a layer Beehives showing features with this tag",
+      "value": "beehive"
+    },
+    {
+      "key": "id",
+      "description": "Layer 'Beehives' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Insect Hotels') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Beehives allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "panoramax",
+      "description": "The layer 'Beehives allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Beehives allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Beehives allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Beehives allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "capacity",
+      "description": "Layer 'Beehives' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Insect Hotels')"
+    },
+    {
+      "key": "capacity",
+      "description": "Layer 'Beehives' shows capacity=1 with a fixed text, namely 'There is 1 beehive' and allows to pick this as a default answer (in the mapcomplete.org theme 'Insect Hotels')",
+      "value": "1"
+    }
+  ]
+}
--- a/Docs/TagInfo/mapcomplete_lactosefree.json
+++ b/Docs/TagInfo/mapcomplete_lactosefree.json
@ -371,6 +371,25 @@
      "description": "Layer 'Restaurants and fast food' shows delivery=no with a fixed text, namely 'This business does not deliver at home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
      "value": "no"
    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=yes with a fixed text, namely 'This fast-food restaurant has a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if amenity=fast_food)",
+      "value": "yes"
+    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=no with a fixed text, namely 'This fast-food restaurant does not have a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if amenity=fast_food)",
+      "value": "no"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'opening_hours:drive_through' (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if drive_through=yes)"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows opening_hours:drive_through= with a fixed text, namely 'The opening hours of the drive-through are the same as the restaurant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') Picking this answer will delete the key opening_hours:drive_through. (This is only shown if drive_through=yes)",
+      "value": ""
+    },
    {
      "key": "diet:vegetarian",
      "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=no with a fixed text, namely 'No vegetarian options are available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants') (This is only shown if cuisine!=friture)",
@ -611,6 +630,16 @@
      "description": "Layer 'Restaurants and fast food' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Restaurants and fast food' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
--- a/Docs/TagInfo/mapcomplete_nature.json
+++ b/Docs/TagInfo/mapcomplete_nature.json
@ -1511,62 +1511,62 @@
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=yes with a fixed text, namely 'Public' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows access=yes with a fixed text, namely 'This barbecue can be used by anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "yes"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=no with a fixed text, namely 'No access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows access=no with a fixed text, namely 'This barbecue can't be used by anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "no"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=private with a fixed text, namely 'Private' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows access=private with a fixed text, namely 'This barbecue is private' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "private"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=permissive with a fixed text, namely 'Access until revoked' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows access=permissive with a fixed text, namely 'This barbecue can be used by anyone, but the owner can revoke access at any time' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "permissive"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=customers with a fixed text, namely 'Access only for customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows access=customers with a fixed text, namely 'This barbecue can only be used by customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "customers"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=permit with a fixed text, namely 'Access only for authorized persons' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows access=permit with a fixed text, namely 'This barbecue can only be used by authorized persons' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "permit"
    },
    {
      "key": "covered",
-      "description": "Layer 'BBQ' shows covered=no with a fixed text, namely 'The grill is not covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows covered=no with a fixed text, namely 'This barbecue is not covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "no"
    },
    {
      "key": "covered",
-      "description": "Layer 'BBQ' shows covered=yes with a fixed text, namely 'The grill is covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows covered=yes with a fixed text, namely 'This barbecue is covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "yes"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=wood with a fixed text, namely 'Wood' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows fuel=wood with a fixed text, namely 'This barbecue uses wood as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "wood"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=charcoal with a fixed text, namely 'Charcoal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows fuel=charcoal with a fixed text, namely 'This barbecue uses charcoal as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "charcoal"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=electric with a fixed text, namely 'Electric' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows fuel=electric with a fixed text, namely 'This barbecue is powered by electricity' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "electric"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=gas with a fixed text, namely 'Gas' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "description": "Layer 'BBQ' shows fuel=gas with a fixed text, namely 'This barbecue uses gas as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "gas"
    },
    {
@ -1642,6 +1642,207 @@
      "key": "seasonal",
      "description": "Layer 'Firepit' shows seasonal=spring;summer;autumn with a fixed text, namely 'Closed during the winter' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
      "value": "spring;summer;autumn"
+    },
+    {
+      "key": "man_made",
+      "description": "The MapComplete theme Into nature has a layer Insect Hotels showing features with this tag",
+      "value": "insect_hotel"
+    },
+    {
+      "key": "id",
+      "description": "Layer 'Insect Hotels' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Into nature') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "panoramax",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Insect Hotels allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "natural",
+      "description": "The MapComplete theme Into nature has a layer Tree showing features with this tag",
+      "value": "tree"
+    },
+    {
+      "key": "id",
+      "description": "Layer 'Tree' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Into nature') (This is only shown if _backend~.+ & _last_edit:passed_time<300 & (_version_number= | _version_number=1))"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Tree allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "panoramax",
+      "description": "The layer 'Tree allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Tree allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Tree allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Tree allows to upload images and adds them under the 'panoramax'-tag (and panoramax:0, panoramax:1, ... for multiple images). Furthermore, this layer shows images based on the keys panoramax, image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "species:wikidata",
+      "description": "Layer 'Tree' shows and asks freeform values for key 'species:wikidata' (in the mapcomplete.org theme 'Into nature')"
+    },
+    {
+      "key": "circumference",
+      "description": "Layer 'Tree' shows and asks freeform values for key 'circumference' (in the mapcomplete.org theme 'Into nature')"
+    },
+    {
+      "key": "height",
+      "description": "Layer 'Tree' shows and asks freeform values for key 'height' (in the mapcomplete.org theme 'Into nature')"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=landmark with a fixed text, namely 'The tree is remarkable due to its size or prominent location. It is useful for navigation.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "landmark"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=natural_monument with a fixed text, namely 'The tree is a natural monument, e.g. because it is especially old, or of a valuable species.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "natural_monument"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=agricultural with a fixed text, namely 'The tree is used for agricultural purposes, e.g. in an orchard.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "agricultural"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=park with a fixed text, namely 'The tree is in a park or similar (cemetery, school grounds, …).' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "park"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=garden with a fixed text, namely 'The tree is in a residential garden.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "garden"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=avenue with a fixed text, namely 'This is a tree along an avenue.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "avenue"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=urban with a fixed text, namely 'The tree is in an urban area.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "urban"
+    },
+    {
+      "key": "denotation",
+      "description": "Layer 'Tree' shows denotation=none with a fixed text, namely 'The tree is outside of an urban area.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature')",
+      "value": "none"
+    },
+    {
+      "key": "leaf_type",
+      "description": "Layer 'Tree' shows leaf_type=broadleaved with a fixed text, namely 'Broadleaved' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if species:wikidata=)",
+      "value": "broadleaved"
+    },
+    {
+      "key": "leaf_type",
+      "description": "Layer 'Tree' shows leaf_type=needleleaved with a fixed text, namely 'Needleleaved' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if species:wikidata=)",
+      "value": "needleleaved"
+    },
+    {
+      "key": "leaf_type",
+      "description": "Layer 'Tree' shows leaf_type=leafless with a fixed text, namely 'Permanently leafless' (in the mapcomplete.org theme 'Into nature') (This is only shown if species:wikidata=)",
+      "value": "leafless"
+    },
+    {
+      "key": "leaf_cycle",
+      "description": "Layer 'Tree' shows leaf_cycle=deciduous with a fixed text, namely 'Deciduous: the tree loses its leaves for some time of the year.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if leaf_type!~^(^leafless$)$ & species:wikidata=)",
+      "value": "deciduous"
+    },
+    {
+      "key": "leaf_cycle",
+      "description": "Layer 'Tree' shows leaf_cycle=evergreen with a fixed text, namely 'Evergreen.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if leaf_type!~^(^leafless$)$ & species:wikidata=)",
+      "value": "evergreen"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Tree' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument | name~.+)"
+    },
+    {
+      "key": "name",
+      "description": "Layer 'Tree' shows name= & noname=yes with a fixed text, namely 'The tree does not have a name.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') Picking this answer will delete the key name. (This is only shown if denotation=landmark | denotation=natural_monument | name~.+)",
+      "value": ""
+    },
+    {
+      "key": "noname",
+      "description": "Layer 'Tree' shows name= & noname=yes with a fixed text, namely 'The tree does not have a name.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument | name~.+)",
+      "value": "yes"
+    },
+    {
+      "key": "heritage",
+      "description": "Layer 'Tree' shows heritage=4 & heritage:operator=OnroerendErfgoed with a fixed text, namely 'Registered as heritage by <i>Onroerend Erfgoed</i> Flanders' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": "4"
+    },
+    {
+      "key": "heritage:operator",
+      "description": "Layer 'Tree' shows heritage=4 & heritage:operator=OnroerendErfgoed with a fixed text, namely 'Registered as heritage by <i>Onroerend Erfgoed</i> Flanders' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": "OnroerendErfgoed"
+    },
+    {
+      "key": "heritage",
+      "description": "Layer 'Tree' shows heritage=4 & heritage:operator=aatl with a fixed text, namely 'Registered as heritage by <i>Direction du Patrimoine culturel</i> Brussels' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": "4"
+    },
+    {
+      "key": "heritage:operator",
+      "description": "Layer 'Tree' shows heritage=4 & heritage:operator=aatl with a fixed text, namely 'Registered as heritage by <i>Direction du Patrimoine culturel</i> Brussels' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": "aatl"
+    },
+    {
+      "key": "heritage",
+      "description": "Layer 'Tree' shows heritage=yes & heritage:operator= with a fixed text, namely 'Registered as heritage by a different organisation' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": "yes"
+    },
+    {
+      "key": "heritage:operator",
+      "description": "Layer 'Tree' shows heritage=yes & heritage:operator= with a fixed text, namely 'Registered as heritage by a different organisation' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') Picking this answer will delete the key heritage:operator. (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": ""
+    },
+    {
+      "key": "heritage",
+      "description": "Layer 'Tree' shows heritage=no & heritage:operator= with a fixed text, namely 'Not registered as heritage' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": "no"
+    },
+    {
+      "key": "heritage:operator",
+      "description": "Layer 'Tree' shows heritage=no & heritage:operator= with a fixed text, namely 'Not registered as heritage' and allows to pick this as a default answer (in the mapcomplete.org theme 'Into nature') Picking this answer will delete the key heritage:operator. (This is only shown if denotation=landmark | denotation=natural_monument)",
+      "value": ""
+    },
+    {
+      "key": "heritage",
+      "description": "Layer 'Tree' shows heritage~.+ with a fixed text, namely 'Registered as heritage by a different organisation' (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument)"
+    },
+    {
+      "key": "ref:OnroerendErfgoed",
+      "description": "Layer 'Tree' shows and asks freeform values for key 'ref:OnroerendErfgoed' (in the mapcomplete.org theme 'Into nature') (This is only shown if heritage=4 & heritage:operator=OnroerendErfgoed)"
+    },
+    {
+      "key": "wikidata",
+      "description": "Layer 'Tree' shows and asks freeform values for key 'wikidata' (in the mapcomplete.org theme 'Into nature') (This is only shown if denotation=landmark | denotation=natural_monument | wikidata~.+)"
    }
  ]
 }
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@ -229,6 +229,16 @@
      "description": "Layer 'Cafés and pubs' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Cafés and pubs' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Cafés and pubs' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Cafés and pubs' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
@ -884,6 +894,25 @@
      "description": "Layer 'Restaurants and fast food' shows delivery=no with a fixed text, namely 'This business does not deliver at home' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
      "value": "no"
    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=yes with a fixed text, namely 'This fast-food restaurant has a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if amenity=fast_food)",
+      "value": "yes"
+    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=no with a fixed text, namely 'This fast-food restaurant does not have a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if amenity=fast_food)",
+      "value": "no"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'opening_hours:drive_through' (in the mapcomplete.org theme 'OnWheels') (This is only shown if drive_through=yes)"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows opening_hours:drive_through= with a fixed text, namely 'The opening hours of the drive-through are the same as the restaurant' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') Picking this answer will delete the key opening_hours:drive_through. (This is only shown if drive_through=yes)",
+      "value": ""
+    },
    {
      "key": "diet:vegetarian",
      "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=no with a fixed text, namely 'No vegetarian options are available' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels') (This is only shown if cuisine!=friture)",
@ -1144,6 +1173,16 @@
      "description": "Layer 'Restaurants and fast food' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Restaurants and fast food' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
@ -1432,6 +1471,15 @@
      "key": "capacity",
      "description": "Layer 'Parking' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'OnWheels')"
    },
+    {
+      "key": "maxstay",
+      "description": "Layer 'Parking' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'OnWheels')"
+    },
+    {
+      "key": "maxstay",
+      "description": "Layer 'Parking' shows maxstay=unlimited with a fixed text, namely 'There is no limit to the amount of time one can stay here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "unlimited"
+    },
    {
      "key": "parking_space",
      "description": "The MapComplete theme OnWheels has a layer Disabled parking spaces showing features with this tag",
--- a/Docs/TagInfo/mapcomplete_parkings.json
+++ b/Docs/TagInfo/mapcomplete_parkings.json
@ -141,6 +141,15 @@
      "key": "capacity",
      "description": "Layer 'Parking' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Parking')"
    },
+    {
+      "key": "maxstay",
+      "description": "Layer 'Parking' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Parking')"
+    },
+    {
+      "key": "maxstay",
+      "description": "Layer 'Parking' shows maxstay=unlimited with a fixed text, namely 'There is no limit to the amount of time one can stay here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking')",
+      "value": "unlimited"
+    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Parking has a layer Parking Spaces showing features with this tag",
@ -1699,11 +1708,11 @@
    },
    {
      "key": "maxstay",
-      "description": "Layer 'Charging stations' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Parking') (This is only shown if maxstay~.+ | motorcar=yes | hgv=yes | bus=yes)"
+      "description": "Layer 'Charging stations' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Parking') (This is only shown if motorcar=yes | hgv=yes | bus=yes)"
    },
    {
      "key": "maxstay",
-      "description": "Layer 'Charging stations' shows maxstay=unlimited with a fixed text, namely 'No timelimit on leaving your vehicle here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if maxstay~.+ | motorcar=yes | hgv=yes | bus=yes)",
+      "description": "Layer 'Charging stations' shows maxstay=unlimited with a fixed text, namely 'There is no limit to the amount of time one can stay here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if motorcar=yes | hgv=yes | bus=yes)",
      "value": "unlimited"
    },
    {
--- a/Docs/TagInfo/mapcomplete_pets.json
+++ b/Docs/TagInfo/mapcomplete_pets.json
@ -447,6 +447,25 @@
      "description": "Layer 'Dog friendly eateries' shows delivery=no with a fixed text, namely 'This business does not deliver at home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
      "value": "no"
    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Dog friendly eateries' shows drive_through=yes with a fixed text, namely 'This fast-food restaurant has a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if amenity=fast_food)",
+      "value": "yes"
+    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Dog friendly eateries' shows drive_through=no with a fixed text, namely 'This fast-food restaurant does not have a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if amenity=fast_food)",
+      "value": "no"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Dog friendly eateries' shows and asks freeform values for key 'opening_hours:drive_through' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if drive_through=yes)"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Dog friendly eateries' shows opening_hours:drive_through= with a fixed text, namely 'The opening hours of the drive-through are the same as the restaurant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') Picking this answer will delete the key opening_hours:drive_through. (This is only shown if drive_through=yes)",
+      "value": ""
+    },
    {
      "key": "diet:vegetarian",
      "description": "Layer 'Dog friendly eateries' shows diet:vegetarian=no with a fixed text, namely 'No vegetarian options are available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities') (This is only shown if cuisine!=friture)",
@ -707,6 +726,16 @@
      "description": "Layer 'Dog friendly eateries' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Dog friendly eateries' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Dog friendly eateries' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Dog friendly eateries' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
--- a/Docs/TagInfo/mapcomplete_playgrounds.json
+++ b/Docs/TagInfo/mapcomplete_playgrounds.json
@ -1167,62 +1167,62 @@
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=yes with a fixed text, namely 'Public' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows access=yes with a fixed text, namely 'This barbecue can be used by anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "yes"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=no with a fixed text, namely 'No access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows access=no with a fixed text, namely 'This barbecue can't be used by anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "no"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=private with a fixed text, namely 'Private' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows access=private with a fixed text, namely 'This barbecue is private' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "private"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=permissive with a fixed text, namely 'Access until revoked' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows access=permissive with a fixed text, namely 'This barbecue can be used by anyone, but the owner can revoke access at any time' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "permissive"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=customers with a fixed text, namely 'Access only for customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows access=customers with a fixed text, namely 'This barbecue can only be used by customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "customers"
    },
    {
      "key": "access",
-      "description": "Layer 'BBQ' shows access=permit with a fixed text, namely 'Access only for authorized persons' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows access=permit with a fixed text, namely 'This barbecue can only be used by authorized persons' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "permit"
    },
    {
      "key": "covered",
-      "description": "Layer 'BBQ' shows covered=no with a fixed text, namely 'The grill is not covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows covered=no with a fixed text, namely 'This barbecue is not covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "no"
    },
    {
      "key": "covered",
-      "description": "Layer 'BBQ' shows covered=yes with a fixed text, namely 'The grill is covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows covered=yes with a fixed text, namely 'This barbecue is covered' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "yes"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=wood with a fixed text, namely 'Wood' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows fuel=wood with a fixed text, namely 'This barbecue uses wood as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "wood"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=charcoal with a fixed text, namely 'Charcoal' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows fuel=charcoal with a fixed text, namely 'This barbecue uses charcoal as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "charcoal"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=electric with a fixed text, namely 'Electric' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows fuel=electric with a fixed text, namely 'This barbecue is powered by electricity' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "electric"
    },
    {
      "key": "fuel",
-      "description": "Layer 'BBQ' shows fuel=gas with a fixed text, namely 'Gas' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
+      "description": "Layer 'BBQ' shows fuel=gas with a fixed text, namely 'This barbecue uses gas as fuel' and allows to pick this as a default answer (in the mapcomplete.org theme 'Playgrounds')",
      "value": "gas"
    }
  ]
--- a/Docs/TagInfo/mapcomplete_ski.json
+++ b/Docs/TagInfo/mapcomplete_ski.json
@ -144,7 +144,7 @@
    },
    {
      "key": "aerialway",
-      "description": "Layer 'Aerialways' shows aerialway=rope_tow with a fixed text, namely 'A tow line which which drags skieers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
+      "description": "Layer 'Aerialways' shows aerialway=rope_tow with a fixed text, namely 'A tow line which skiers hold on to or attach themselves onto' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
      "value": "rope_tow"
    },
    {
@ -154,7 +154,7 @@
    },
    {
      "key": "aerialway",
-      "description": "Layer 'Aerialways' shows aerialway=zip_line with a fixed text, namely 'A zip line. (A touristical attraction where adventurous people go down at high speeds) ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
+      "description": "Layer 'Aerialways' shows aerialway=zip_line with a fixed text, namely 'A zip line. (A touristic attraction where adventurous people go down at high speeds)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
      "value": "zip_line"
    },
    {
@ -1278,6 +1278,25 @@
      "description": "Layer 'Restaurants and fast food' shows delivery=no with a fixed text, namely 'This business does not deliver at home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
      "value": "no"
    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=yes with a fixed text, namely 'This fast-food restaurant has a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if amenity=fast_food)",
+      "value": "yes"
+    },
+    {
+      "key": "drive_through",
+      "description": "Layer 'Restaurants and fast food' shows drive_through=no with a fixed text, namely 'This fast-food restaurant does not have a drive-through' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if amenity=fast_food)",
+      "value": "no"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows and asks freeform values for key 'opening_hours:drive_through' (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if drive_through=yes)"
+    },
+    {
+      "key": "opening_hours:drive_through",
+      "description": "Layer 'Restaurants and fast food' shows opening_hours:drive_through= with a fixed text, namely 'The opening hours of the drive-through are the same as the restaurant' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways') Picking this answer will delete the key opening_hours:drive_through. (This is only shown if drive_through=yes)",
+      "value": ""
+    },
    {
      "key": "diet:vegetarian",
      "description": "Layer 'Restaurants and fast food' shows diet:vegetarian=no with a fixed text, namely 'No vegetarian options are available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways') (This is only shown if cuisine!=friture)",
@ -1538,6 +1557,16 @@
      "description": "Layer 'Restaurants and fast food' shows service:electricity=no with a fixed text, namely 'There are a no domestic sockets available to customers seated indoors' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
      "value": "no"
    },
+    {
+      "key": "outdoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows outdoor_seating=yes with a fixed text, namely 'This place has outdoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
+      "value": "yes"
+    },
+    {
+      "key": "indoor_seating",
+      "description": "Layer 'Restaurants and fast food' shows indoor_seating=yes with a fixed text, namely 'This place has indoor seating' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
+      "value": "yes"
+    },
    {
      "key": "dog",
      "description": "Layer 'Restaurants and fast food' shows dog=yes with a fixed text, namely 'Dogs are allowed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
--- a/Docs/TagInfo/mapcomplete_sports.json
+++ b/Docs/TagInfo/mapcomplete_sports.json
@ -730,7 +730,7 @@
    },
    {
      "key": "sport",
-      "description": "Layer 'Sports centres' shows sport=climbing with a fixed text, namely 'Rock climbing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
+      "description": "Layer 'Sports centres' shows sport=climbing with a fixed text, namely 'Climbing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Sports')",
      "value": "climbing"
    },
    {
--- a/Docs/TagInfo/mapcomplete_transit.json
+++ b/Docs/TagInfo/mapcomplete_transit.json
@ -575,6 +575,15 @@
      "key": "capacity",
      "description": "Layer 'Parking' shows and asks freeform values for key 'capacity' (in the mapcomplete.org theme 'Bus routes')"
    },
+    {
+      "key": "maxstay",
+      "description": "Layer 'Parking' shows and asks freeform values for key 'maxstay' (in the mapcomplete.org theme 'Bus routes')"
+    },
+    {
+      "key": "maxstay",
+      "description": "Layer 'Parking' shows maxstay=unlimited with a fixed text, namely 'There is no limit to the amount of time one can stay here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Bus routes')",
+      "value": "unlimited"
+    },
    {
      "key": "amenity",
      "description": "The MapComplete theme Bus routes has a layer Shelter showing features with this tag",
--- a/Docs/Themes/cyclofix.md
+++ b/Docs/Themes/cyclofix.md
@ -244,7 +244,7 @@ These layers can not be reused in different themes.

 This layer is based on [assisted_repair](../Layers/assisted_repair.md)

-A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location.  A repair café is a type of event organized regularly along the same principles.
+A self-assisted workshop is a location where people can come and repair their goods with help of volunteers and with the tools available at the given location. A repair café is a type of event organized regularly along the same principles.

 - This layer is shown at zoomlevel **11** and higher

@ -1740,9 +1740,9 @@ This tagrendering is only visible in the popup if the following condition is met
 The question is `What is the maximum amount of time one is allowed to stay here?`
 *One can stay at most <b>{canonical(maxstay)}</b>* is shown if `maxstay` is set

- -  *No timelimit on leaving your vehicle here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>
+ -  *There is no limit to the amount of time one can stay here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>

-This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a> | maxstay~.+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a>

 ### Network

--- a/Docs/Themes/etymology.md
+++ b/Docs/Themes/etymology.md
@ -16,6 +16,7 @@ This theme contains the following layers:
 - [toursistic_places_without_etymology (defined in this theme)](#toursistic_places_without_etymology)
 - [health_and_social_places_without_etymology (defined in this theme)](#health_and_social_places_without_etymology)
 - [sport_places_without_etymology (defined in this theme)](#sport_places_without_etymology)
+ - [parks_without_etymology (defined in this theme)](#parks_without_etymology)

 Available languages:

@ -137,6 +138,20 @@ Available languages:
    + [etymology_multi_apply](#etymology_multi_apply)
    + [wikipedia](#wikipedia)
    + [lod](#lod)
+9. [parks_without_etymology](#parks_without_etymology)
+  - [Basic tags for this layer](#basic-tags-for-this-layer)
+  - [Supported attributes](#supported-attributes)
+    + [etymology-images-from-wikipedia](#etymology-images-from-wikipedia)
+    + [wikipedia-etymology](#wikipedia-etymology)
+    + [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
+    + [zoeken op inventaris onroerend erfgoed](#zoeken-op-inventaris-onroerend-erfgoed)
+    + [simple etymology](#simple-etymology)
+    + [questions](#questions)
+    + [street-name-sign-image](#street-name-sign-image)
+    + [minimap](#minimap)
+    + [etymology_multi_apply](#etymology_multi_apply)
+    + [wikipedia](#wikipedia)
+    + [lod](#lod)

 # Layers defined in this theme configuration file
 These layers can not be reused in different themes.
@ -741,6 +756,92 @@ This tagrendering is only visible in the popup if the following condition is met
 _This tagrendering has no question and is thus read-only_
 *{linked_data_from_website()}*

+This tagrendering has labels 
+`added_by_default`
+# parks_without_etymology
+
+This layer is based on [etymology](../Layers/etymology.md)
+
+All objects which have an etymology known
+
+ - This layer is shown at zoomlevel **18** and higher
+
+No themes use this layer
+
+## Basic tags for this layer
+
+Elements must match **all** of the following expressions:
+
+0. <a href='https://wiki.openstreetmap.org/wiki/Key:landuse' target='_blank'>landuse</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:landuse%3Dvillage_green' target='_blank'>village_green</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:landuse' target='_blank'>landuse</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:landuse%3Drecreation_ground' target='_blank'>recreation_ground</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dpark' target='_blank'>park</a>
+1. name~.+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B%28%20%20%20%20nwr%5B%22landuse%22%3D%22village_green%22%5D%5B%22name%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22landuse%22%3D%22recreation_ground%22%5D%5B%22name%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%20%20%20%20nwr%5B%22leisure%22%3D%22park%22%5D%5B%22name%22%5D%28%7B%7Bbbox%7D%7D%29%3B%0A%29%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+## Supported attributes
+
+**Warning:**,this quick overview is incomplete,
+
+| attribute | type | values which are supported by this layer |
+-----|-----|----- |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name:etymology:wikidata#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name%3Aetymology%3Awikidata/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name:etymology:wikidata](https://wiki.openstreetmap.org/wiki/Key:name:etymology:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name:etymology#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name%3Aetymology/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name:etymology](https://wiki.openstreetmap.org/wiki/Key:name:etymology) | [text](../SpecialInputElements.md#text) | [unknown](https://wiki.openstreetmap.org/wiki/Tag:name:etymology%3Dunknown) |
+
+### etymology-images-from-wikipedia
+
+_This tagrendering has no question and is thus read-only_
+*{image_carousel(name:etymology:wikidata)}*
+
+### wikipedia-etymology
+
+The question is `What is the Wikidata-item that this object is named after?`
+*<h3>Wikipedia article of the name giver</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}* is shown if `name:etymology:wikidata` is set
+
+### zoeken op inventaris onroerend erfgoed
+
+_This tagrendering has no question and is thus read-only_
+*<a href='https://inventaris.onroerenderfgoed.be/erfgoedobjecten?tekst={name}' target='_blank'>Search on inventaris onroerend erfgoed</a>*
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:_country' target='_blank'>_country</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:_country%3Dbe' target='_blank'>be</a>
+
+### simple etymology
+
+The question is `What is this object named after?`
+*Named after {name:etymology}* is shown if `name:etymology` is set
+
+ -  *The origin of this name is unknown in all literature* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:name:etymology' target='_blank'>name:etymology</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:name:etymology%3Dunknown' target='_blank'>unknown</a>
+
+### questions
+Show the questions block at this location
+_This tagrendering has no question and is thus read-only_
+*{questions()}*
+
+### street-name-sign-image
+
+_This tagrendering has no question and is thus read-only_
+*{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Add image of a street name sign)}*
+
+### minimap
+
+_This tagrendering has no question and is thus read-only_
+*{minimap(18, id, _same_name_ids):height:10rem}*
+
+### etymology_multi_apply
+
+_This tagrendering has no question and is thus read-only_
+*{multi_apply(_same_name_ids, name:etymology:wikidata;name:etymology, Auto-applying data on all segments with the same name, true)}*
+
+### wikipedia
+
+_This tagrendering has no question and is thus read-only_
+*A Wikipedia article about this <b>street</b> exists:<br/>{wikipedia():max-height:25rem}*
+
+This tagrendering is only visible in the popup if the following condition is met: wikidata~.+
+
+### lod
+
+_This tagrendering has no question and is thus read-only_
+*{linked_data_from_website()}*
+
 This tagrendering has labels 
 `added_by_default`

--- a/Docs/Themes/fritures.md
+++ b/Docs/Themes/fritures.md
@ -52,6 +52,9 @@ Available languages:
    + [Reservation](#reservation)
    + [Takeaway](#takeaway)
    + [delivery](#delivery)
+    + [drive-through](#drive-through)
+    + [drive-through-opening_hours](#drive-through-opening_hours)
+    + [Drive-through opening hours](#drive-through-opening-hours)
    + [Vegetarian (no friture)](#vegetarian-(no-friture))
    + [Vegan (no friture)](#vegan-(no-friture))
    + [halal (no friture)](#halal-(no-friture))
@ -66,6 +69,7 @@ Available languages:
    + [lactose_free](#lactose_free)
    + [smoking](#smoking)
    + [service:electricity](#serviceelectricity)
+    + [seating](#seating)
    + [dog-access](#dog-access)
    + [internet](#internet)
    + [internet-fee](#internet-fee)
@ -116,6 +120,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -299,6 +305,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -440,6 +464,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -554,6 +585,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Themes/glutenfree.md
+++ b/Docs/Themes/glutenfree.md
@ -57,6 +57,9 @@ Available languages:
    + [Reservation](#reservation)
    + [Takeaway](#takeaway)
    + [delivery](#delivery)
+    + [drive-through](#drive-through)
+    + [drive-through-opening_hours](#drive-through-opening_hours)
+    + [Drive-through opening hours](#drive-through-opening-hours)
    + [Vegetarian (no friture)](#vegetarian-(no-friture))
    + [Vegan (no friture)](#vegan-(no-friture))
    + [halal (no friture)](#halal-(no-friture))
@ -70,6 +73,7 @@ Available languages:
    + [lactose_free](#lactose_free)
    + [smoking](#smoking)
    + [service:electricity](#serviceelectricity)
+    + [seating](#seating)
    + [dog-access](#dog-access)
    + [internet](#internet)
    + [internet-fee](#internet-fee)
@ -192,6 +196,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -386,6 +392,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -515,6 +539,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -629,6 +660,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Themes/insects.md
+++ b/Docs/Themes/insects.md
@ -0,0 +1,23 @@
+[//]: # (WARNING: this file is automatically generated. Please find the sources at the bottom and edit those sources)
+
+## Insect Hotels ( [insects](https://mapcomplete.org/insects) )
+_This document details some technical information about this MapComplete theme, mostly about the attributes used in the theme. Various links point toward more information about the attributes, e.g. to the OpenStreetMap-wiki, to TagInfo or tools creating statistics_
+The theme introduction reads:
+
+> Insect hotels provide shelter for insects.
+
+This theme contains the following layers:
+
+ - [insect_hotel](../Layers/insect_hotel.md)
+ - [beehive](../Layers/beehive.md)
+
+Available languages:
+
+ - en
+ - nl
+
+# Layers defined in this theme configuration file
+These layers can not be reused in different themes.
+
+
+This document is autogenerated from [assets/themes/insects/insects.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/insects/insects.json)
--- a/Docs/Themes/lactosefree.md
+++ b/Docs/Themes/lactosefree.md
@ -54,6 +54,9 @@ Available languages:
    + [Reservation](#reservation)
    + [Takeaway](#takeaway)
    + [delivery](#delivery)
+    + [drive-through](#drive-through)
+    + [drive-through-opening_hours](#drive-through-opening_hours)
+    + [Drive-through opening hours](#drive-through-opening-hours)
    + [Vegetarian (no friture)](#vegetarian-(no-friture))
    + [Vegan (no friture)](#vegan-(no-friture))
    + [halal (no friture)](#halal-(no-friture))
@ -67,6 +70,7 @@ Available languages:
    + [gluten_free](#gluten_free)
    + [smoking](#smoking)
    + [service:electricity](#serviceelectricity)
+    + [seating](#seating)
    + [dog-access](#dog-access)
    + [internet](#internet)
    + [internet-fee](#internet-fee)
@ -189,6 +193,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -383,6 +389,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -512,6 +536,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -626,6 +657,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Themes/nature.md
+++ b/Docs/Themes/nature.md
@ -20,6 +20,8 @@ This theme contains the following layers:
 - [shelter](../Layers/shelter.md)
 - [bbq](../Layers/bbq.md)
 - [firepit](../Layers/firepit.md)
+ - [insect_hotel](../Layers/insect_hotel.md)
+ - [tree_node](../Layers/tree_node.md)

 Available languages:

--- a/Docs/Themes/openlovemap.md
+++ b/Docs/Themes/openlovemap.md
@ -1293,7 +1293,7 @@ This tagrendering has labels

 This layer is based on [cinema](../Layers/cinema.md)

- A place showing movies (films), generally open to the public for a fee. Commonly referred to as a movie theater in the US
+A place showing movies (films), generally open to the public for a fee. Commonly referred to as a movie theater in the US.

 - This layer is shown at zoomlevel **6** and higher

--- a/Docs/Themes/personal.md
+++ b/Docs/Themes/personal.md
@ -19,6 +19,7 @@ This theme contains the following layers:
 - [bank](../Layers/bank.md)
 - [barrier](../Layers/barrier.md)
 - [bbq](../Layers/bbq.md)
+ - [beehive](../Layers/beehive.md)
 - [bench](../Layers/bench.md)
 - [bench_at_pt](../Layers/bench_at_pt.md)
 - [bicycle_counter](../Layers/bicycle_counter.md)
@ -75,6 +76,7 @@ This theme contains the following layers:
 - [ice_cream](../Layers/ice_cream.md)
 - [indoors](../Layers/indoors.md)
 - [information_board](../Layers/information_board.md)
+ - [insect_hotel](../Layers/insect_hotel.md)
 - [kerbs](../Layers/kerbs.md)
 - [kindergarten_childcare](../Layers/kindergarten_childcare.md)
 - [lighthouse](../Layers/lighthouse.md)
--- a/Docs/Themes/pets.md
+++ b/Docs/Themes/pets.md
@ -61,6 +61,9 @@ Available languages:
    + [Reservation](#reservation)
    + [Takeaway](#takeaway)
    + [delivery](#delivery)
+    + [drive-through](#drive-through)
+    + [drive-through-opening_hours](#drive-through-opening_hours)
+    + [Drive-through opening hours](#drive-through-opening-hours)
    + [Vegetarian (no friture)](#vegetarian-(no-friture))
    + [Vegan (no friture)](#vegan-(no-friture))
    + [halal (no friture)](#halal-(no-friture))
@ -75,6 +78,7 @@ Available languages:
    + [lactose_free](#lactose_free)
    + [smoking](#smoking)
    + [service:electricity](#serviceelectricity)
+    + [seating](#seating)
    + [dog-access](#dog-access)
    + [internet](#internet)
    + [internet-fee](#internet-fee)
@ -174,6 +178,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/delivery#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/delivery/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [delivery](https://wiki.openstreetmap.org/wiki/Key:delivery) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/drive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [drive_through](https://wiki.openstreetmap.org/wiki/Key:drive_through) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours:drive_through#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours%3Adrive_through/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours:drive_through](https://wiki.openstreetmap.org/wiki/Key:opening_hours:drive_through) | [opening_hours](../SpecialInputElements.md#opening_hours) | [](https://wiki.openstreetmap.org/wiki/Tag:opening_hours:drive_through%3D) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegetarian#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegetarian/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegetarian](https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:vegan#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Avegan/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:vegan](https://wiki.openstreetmap.org/wiki/Key:diet:vegan) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [on_demand](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:halal#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Ahalal/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:halal](https://wiki.openstreetmap.org/wiki/Key:diet:halal) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly) |
@ -357,6 +363,24 @@ The question is `Does {title()} deliver food to your home?`
 -  *This business does home delivery (possibly via a third party)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dyes' target='_blank'>yes</a>
 -  *This business does not deliver at home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:delivery' target='_blank'>delivery</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:delivery%3Dno' target='_blank'>no</a>

+### drive-through
+
+The question is `Does this fast-food restaurant have a drive-through?`
+
+ -  *This fast-food restaurant has a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+ -  *This fast-food restaurant does not have a drive-through* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dno' target='_blank'>no</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>
+
+### drive-through-opening_hours
+
+The question is `What are the opening hours of the drive-through?`
+*<h3>Drive-through opening hours</h3>{opening_hours_table(opening_hours:drive_through)}* is shown if `opening_hours:drive_through` is set
+
+ -  *The opening hours of the drive-through are the same as the restaurant* is shown if with opening_hours:drive_through=
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:drive_through' target='_blank'>drive_through</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:drive_through%3Dyes' target='_blank'>yes</a>
+
 ### Vegetarian (no friture)

 The question is `Does this restaurant have a vegetarian option?`
@ -498,6 +522,13 @@ The question is `Does this amenity have electrical outlets, available to custome
 -  *There are no sockets available indoors to customers, but charging might be possible if the staff is asked* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask' target='_blank'>ask</a>
 -  *There are a no domestic sockets available to customers seated indoors* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:electricity' target='_blank'>service:electricity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno' target='_blank'>no</a>

+### seating
+
+The question is `What kind of seating does {title()} have?`
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/outdoor_seating/outdoor_seating.svg' style='width: 3rem; height: 3rem'> *This place has outdoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:outdoor_seating' target='_blank'>outdoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:outdoor_seating%3Dno' target='_blank'>no</a>
+ -  *This place has indoor seating* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dyes' target='_blank'>yes</a>. Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:indoor_seating' target='_blank'>indoor_seating</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor_seating%3Dno' target='_blank'>no</a>
+
 ### dog-access

 The question is `Are dogs allowed in this business?`
@ -612,6 +643,14 @@ This tagrendering has labels
 -----|-----|----- |
 | lactose_free.0 | Has a lactose free offering | diet:lactose_free=yes | diet:lactose_free=only | diet:lactose_free=limited |

+| id | question | osmTags |
+-----|-----|----- |
+| outdoor_seating.0 | Has outdoor seating | outdoor_seating=yes |
+
+| id | question | osmTags |
+-----|-----|----- |
+| indoor_seating.0 | Has indoor seating | indoor_seating=yes |
+
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
--- a/Docs/Themes/toerisme_vlaanderen.md
+++ b/Docs/Themes/toerisme_vlaanderen.md
@ -1308,9 +1308,9 @@ This tagrendering is only visible in the popup if the following condition is met
 The question is `What is the maximum amount of time one is allowed to stay here?`
 *One can stay at most <b>{canonical(maxstay)}</b>* is shown if `maxstay` is set

- -  *No timelimit on leaving your vehicle here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>
+ -  *There is no limit to the amount of time one can stay here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>

-This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a> | maxstay~.+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:bus' target='_blank'>bus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:bus%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:hgv' target='_blank'>hgv</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:hgv%3Dyes' target='_blank'>yes</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:motorcar' target='_blank'>motorcar</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:motorcar%3Dyes' target='_blank'>yes</a>

 ### Network

--- a/Docs/Themes/uk_addresses.md
+++ b/Docs/Themes/uk_addresses.md
@ -125,7 +125,7 @@ This tagrendering is only visible in the popup if the following condition is met
 ### uk_addresses_import_button

 _This tagrendering has no question and is thus read-only_
-*{import_button(address,urpn_count=$urpn_count;ref:GB:uprn=$ref:GB:uprn$,Add this address,./assets/themes/uk_addresses/housenumber_add.svg,,,,)}*
+*{import_button(address,urpn_count=$urpn_count;ref:GB:uprn=$ref:GB:uprn$,Add this address,./assets/themes/uk_addresses/housenumber_add.svg,,,,,)}*

 ### leftover-questions

--- a/Docs/Themes/velopark.md
+++ b/Docs/Themes/velopark.md
@ -98,7 +98,7 @@ Maproulette challenge containing velopark data

 This layer is loaded from an external source, namely 

-`https://maproulette.org/api/v2/challenge/view/43282`
+`https://maproulette.org/api/v2/challenge/view/50552`

 No themes use this layer

@ -176,7 +176,7 @@ This tagrendering is only visible in the popup if the following condition is met
 ### import_point

 _This tagrendering has no question and is thus read-only_
-*{import_button(bike_parking_with_velopark_ref bike_parking,amenity=bicycle_parking;ref:velopark=$ref:velopark,Create a new bicycle parking in OSM. This parking will have the link&COMMA you'll be able to copy the attributes in the next step,,,,,mr_taskId)}*
+*{import_button(bike_parking_with_velopark_ref bike_parking,amenity=bicycle_parking;ref:velopark=$ref:velopark,Create a new bicycle parking in OSM. This parking will have the link&COMMA you'll be able to copy the attributes in the next step,,,,,mr_taskId,yes)}*

 This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:mr_taskStatus' target='_blank'>mr_taskStatus</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:mr_taskStatus%3DCreated' target='_blank'>Created</a>

--- a/Docs/URL_Parameters.md
+++ b/Docs/URL_Parameters.md
@ -35,10 +35,10 @@ This document gives an overview of which URL-parameters can be used to influence
 26. [background](#background)
    + [Selecting a category](#selecting-a-category)
    + [Selecting a specific layer](#selecting-a-specific-layer)
-27. [z](#z)
-28. [lat](#lat)
-29. [lon](#lon)
-30. [oauth_token](#oauth_token)
+27. [oauth_token](#oauth_token)
+28. [z](#z)
+29. [lat](#lat)
+30. [lon](#lon)
 31. [layer-public_bookcase](#layer-public_bookcase)
 32. [filter-public_bookcase-kid-books](#filter-public_bookcase-kid-books)
 33. [filter-public_bookcase-adult-books](#filter-public_bookcase-adult-books)
@ -307,8 +307,6 @@ One can use the [ID of an ELI-layer](./ELI-overview.md) or use one of the global
 - protomaps.black
 - protomaps.sunny_unlabeled
 - americana
- - maptiler
- - maptiler.carto
 - alidade.smooth
 - alidade.smooth_dark
 - stamen.terrain
@ -336,11 +334,19 @@ This documentation is defined in the source code at [FeatureSwitchState.ts](/src

 No default value set

+## oauth_token
+
+Used to complete the login
+
+This documentation is defined in the source code at [ThemeViewState.ts](/src/Models/ThemeViewState.ts#L177)
+
+No default value set
+
 ## z

 The initial/current zoom level

-This documentation is defined in the source code at [InitialMapPositioning.ts](/src/Logic/Actors/InitialMapPositioning.ts#L37)
+This documentation is defined in the source code at [InitialMapPositioning.ts](/src/Logic/Actors/InitialMapPositioning.ts#L39)

 The default value is _1_

@ -348,7 +354,7 @@ The default value is _1_

 The initial/current latitude

-This documentation is defined in the source code at [InitialMapPositioning.ts](/src/Logic/Actors/InitialMapPositioning.ts#L37)
+This documentation is defined in the source code at [InitialMapPositioning.ts](/src/Logic/Actors/InitialMapPositioning.ts#L39)

 The default value is _0_

@ -356,18 +362,10 @@ The default value is _0_

 The initial/current longitude of the app

-This documentation is defined in the source code at [InitialMapPositioning.ts](/src/Logic/Actors/InitialMapPositioning.ts#L37)
+This documentation is defined in the source code at [InitialMapPositioning.ts](/src/Logic/Actors/InitialMapPositioning.ts#L39)

 The default value is _0_

-## oauth_token
-
-Used to complete the login
-
-This documentation is defined in the source code at [ThemeViewState.ts](/src/Models/ThemeViewState.ts#L189)
-
-No default value set
-
 ## layer-public_bookcase

 Whether or not layer public_bookcase is shown
--- a/Docs/wikiIndex.txt
+++ b/Docs/wikiIndex.txt
@ -427,6 +427,15 @@ The position of a signpost can be used by a hiker/biker/rider/s…
 |genre= POI, editor, indoors
 }}
 {{service_item
+|name= [https://mapcomplete.org/insects insects]
+|region= Worldwide
+|lang= {{#language:en|en}}, {{#language:nl|en}}
+|descr= A MapComplete theme: Insect hotels provide shelter for insects
+|material= {{yes|[https://mapcomplete.org/ Yes]}}
+|image= MapComplete_Screenshot.png
+|genre= POI, editor, insects
+}}
+{{service_item
 |name= [https://mapcomplete.org/kerbs_and_crossings kerbs_and_crossings]
 |region= Worldwide
 |lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:da|en}}, {{#language:cs|en}}, {{#language:nb_NO|en}}, {{#language:es|en}}, {{#language:ca|en}}, {{#language:pl|en}}, {{#language:uk|en}}