Chore: regen docs

Docs/BuiltinQuestions.md

@@ -15,10 +15,6 @@ This is a special layer - data is not sourced from OpenStreetMap
 
 1. [Supported attributes](#supported-attributes)
 2. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Opening hours](#opening-hours)
-  - [Opening hours](#opening-hours)
-  - [Opening hours](#opening-hours)
   - [questions](#questions)
   - [images](#images)
   - [images_no_blur](#images_no_blur)
@@ -37,13 +33,9 @@ This is a special layer - data is not sourced from OpenStreetMap
   - [dog-access](#dog-access)
   - [description](#description)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [opening_hours_24_7_default](#opening_hours_24_7_default)
-  - [Opening hours](#opening-hours)
   - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
   - [service:electricity](#serviceelectricity)
   - [payment-options](#payment-options)
   - [payment-options-split](#payment-options-split)

Docs/Layers/aerialway.md

@@ -12,13 +12,11 @@ Various forms of transport for passengers and goods that use wires, including ca
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [type](#type)
   - [duration](#duration)
   - [occupancy](#occupancy)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [oneway](#oneway)
   - [length](#length)
   - [leftover-questions](#leftover-questions)

Docs/Layers/all_vending_machine.md

@@ -15,14 +15,12 @@ Layer showing vending machines
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [repeated](#repeated)
   - [single_level](#single_level)
   - [vending](#vending)
   - [bicycle_tube_vending_machine-brand](#bicycle_tube_vending_machine-brand)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [payment-options-split](#payment-options-split)
   - [denominations-coins](#denominations-coins)
   - [denominations-notes](#denominations-notes)

Docs/Layers/animal_shelter.md

@@ -13,7 +13,6 @@ An animal shelter is a facility where animals in trouble are brought and facilit
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [2](#2)
@@ -22,7 +21,6 @@ An animal shelter is a facility where animals in trouble are brought and facilit
   - [email](#email)
   - [6](#6)
   - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
   - [boarded_animals](#boarded_animals)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)

Docs/Layers/artwork.md

@@ -14,8 +14,6 @@ An open map of statues, busts, graffitis and other artwork all over the world
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [images_no_blur](#images_no_blur)
   - [artwork-artwork_type](#artwork-artwork_type)
   - [artwork-artist-wikidata](#artwork-artist-wikidata)
@@ -27,9 +25,7 @@ An open map of statues, busts, graffitis and other artwork all over the world
   - [memorial-type](#memorial-type)
   - [inscription](#inscription)
   - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
   - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [doubles_as_bench](#doubles_as_bench)
   - [bench-backrest](#bench-backrest)
   - [bench-armrest](#bench-armrest)

Docs/Layers/artwork_on_wall.md

@@ -14,8 +14,6 @@ An open map of statues, busts, graffitis and other artwork all over the world
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [historic_or_not](#historic_or_not)
   - [images_no_blur](#images_no_blur)
   - [artwork-artwork_type](#artwork-artwork_type)
@@ -28,9 +26,7 @@ An open map of statues, busts, graffitis and other artwork all over the world
   - [memorial-type](#memorial-type)
   - [inscription](#inscription)
   - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
   - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [doubles_as_bench](#doubles_as_bench)
   - [bench-backrest](#bench-backrest)
   - [bench-armrest](#bench-armrest)

Docs/Layers/assisted_repair.md

@@ -13,12 +13,10 @@ A self-assisted workshop is a location where people can come and repair their go
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [preset_description](#preset_description)
   - [name](#name)
   - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/atm.md

@@ -13,13 +13,11 @@ ATMs to withdraw money
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [name](#name)
   - [brand](#brand)
   - [operator](#operator)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [indoor](#indoor)
   - [cash_out](#cash_out)
   - [cash_in](#cash_in)

Docs/Layers/bench.md

@@ -13,8 +13,6 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [images](#images)
   - [bench-backrest](#bench-backrest)
   - [bench-armrest](#bench-armrest)
@@ -32,9 +30,7 @@ A bench is a wooden, metal, stone, … surface where a human can sit. This layer
   - [artwork-website](#artwork-website)
   - [artwork_subject](#artwork_subject)
   - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
   - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [delete-button](#delete-button)

Docs/Layers/bicycle_assisted_repair_workshop.md

@@ -14,12 +14,10 @@ A self-assisted workshop is a location where people can come and repair their go
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [preset_description](#preset_description)
   - [name](#name)
   - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/bicycle_library.md

@@ -13,14 +13,12 @@ A facility where bicycles can be lent for longer period of times
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [bicycle_library-name](#bicycle_library-name)
   - [website](#website)
   - [phone](#phone)
   - [email](#email)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [bicycle_library-charge](#bicycle_library-charge)
   - [bicycle-library-target-group](#bicycle-library-target-group)
   - [description](#description)

Docs/Layers/bicycle_rental.md

@@ -13,14 +13,12 @@ Bicycle rental stations
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [bicycle_rental_type](#bicycle_rental_type)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [payment-options](#payment-options)
   - [payment-options-advanced](#payment-options-advanced)
   - [bicycle-types](#bicycle-types)

Docs/Layers/bicycle_rental_non_docking.md

@@ -14,14 +14,12 @@ Bicycle rental stations
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [bicycle_rental_type](#bicycle_rental_type)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [payment-options](#payment-options)
   - [payment-options-advanced](#payment-options-advanced)
   - [bicycle-types](#bicycle-types)

Docs/Layers/bike_cafe.md

@@ -13,7 +13,6 @@ A bike café is a café geared towards cyclists, for example with services such
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [bike_cafe-name](#bike_cafe-name)
   - [bike_cafe-bike-pump](#bike_cafe-bike-pump)
@@ -23,7 +22,6 @@ A bike café is a café geared towards cyclists, for example with services such
   - [phone](#phone)
   - [email](#email)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [delete-button](#delete-button)

Docs/Layers/bike_cleaning.md

@@ -13,10 +13,8 @@ A layer showing facilities where one can clean their bike
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge)
   - [bike_cleaning-charge](#bike_cleaning-charge)
   - [payment-options-split](#payment-options-split)

Docs/Layers/bike_parking.md

@@ -13,7 +13,6 @@ A layer showing where you can park your bike
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [Bicycle parking type](#bicycle-parking-type)
   - [location](#location)
@@ -23,7 +22,6 @@ A layer showing where you can park your bike
   - [fee](#fee)
   - [charge](#charge)
   - [opening_hours_24_7_default](#opening_hours_24_7_default)
-  - [Opening hours](#opening-hours)
   - [operator](#operator)
   - [operator_phone](#operator_phone)
   - [operator_website](#operator_website)

Docs/Layers/bike_repair_station.md

@@ -13,12 +13,10 @@ A layer showing bicycle pumps and bicycle repair tool stands
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [bike_repair_station-available-services](#bike_repair_station-available-services)
   - [Operational status](#operational-status)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [access](#access)
   - [bike_repair_station-operator](#bike_repair_station-operator)
   - [bike_repair_station-email](#bike_repair_station-email)

Docs/Layers/bike_shop.md

@@ -14,7 +14,6 @@ A shop specifically selling bicycles or related items
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
@@ -22,7 +21,6 @@ A shop specifically selling bicycles or related items
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/bike_themed_object.md

@@ -12,14 +12,12 @@ A layer with bike-themed objects but who don't match any other layer
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [description](#description)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [leftover-questions](#leftover-questions)
   - [lod](#lod)
 5. [Filters](#filters)

Docs/Layers/brothel.md

@@ -13,12 +13,10 @@ An establishment specifically dedicated to prostitution.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [name](#name)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/cafe_pub.md

@@ -14,13 +14,11 @@ A layer showing cafés and pubs where one can gather around a drink. The layer a
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [Name](#name)
   - [Classification](#classification)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/car_rental.md

@@ -13,14 +13,12 @@ Places where you can rent a car
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [name](#name)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [lod](#lod)

Docs/Layers/charge_point.md

@@ -13,7 +13,6 @@ Layer showing individual charge points within a charging station
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Technical questions](#technical-questions)
   - [images](#images)
   - [ref](#ref)
   - [capacity](#capacity)
@@ -41,7 +40,6 @@ Layer showing individual charge points within a charging station
   - [plugs-amount-socket:nacs](#plugs-amount-socketnacs)
   - [questions](#questions)
   - [questions-technical](#questions-technical)
-  - [Technical questions](#technical-questions)
   - [voltage-socket:schuko](#voltage-socketschuko)
   - [current-socket:schuko](#current-socketschuko)
   - [power-output-socket:schuko](#power-output-socketschuko)

Docs/Layers/charging_station.md

@@ -13,8 +13,6 @@ A charging station
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Technical questions](#technical-questions)
   - [images](#images)
   - [Type](#type)
   - [access](#access)
@@ -105,7 +103,6 @@ A charging station
   - [current-socket:nacs](#current-socketnacs)
   - [power-output-socket:nacs](#power-output-socketnacs)
   - [OH](#oh)
-  - [Opening hours](#opening-hours)
   - [fee](#fee)
   - [charge](#charge)
   - [payment-options](#payment-options)
@@ -125,7 +122,6 @@ A charging station
   - [Parking:fee](#parkingfee)
   - [questions](#questions)
   - [questions-technical](#questions-technical)
-  - [Technical questions](#technical-questions)
   - [move-button](#move-button)
   - [delete-button](#delete-button)
   - [lod](#lod)

Docs/Layers/charging_station_ebikes.md

@@ -14,8 +14,6 @@ A charging station
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Technical questions](#technical-questions)
   - [images](#images)
   - [Type](#type)
   - [access](#access)
@@ -106,7 +104,6 @@ A charging station
   - [current-socket:nacs](#current-socketnacs)
   - [power-output-socket:nacs](#power-output-socketnacs)
   - [OH](#oh)
-  - [Opening hours](#opening-hours)
   - [fee](#fee)
   - [charge](#charge)
   - [payment-options](#payment-options)
@@ -126,7 +123,6 @@ A charging station
   - [Parking:fee](#parkingfee)
   - [questions](#questions)
   - [questions-technical](#questions-technical)
-  - [Technical questions](#technical-questions)
   - [move-button](#move-button)
   - [delete-button](#delete-button)
   - [lod](#lod)

Docs/Layers/childcare.md

@@ -13,13 +13,11 @@ Shows kindergartens and preschools. Both are grouped in one layer, as they are r
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [name](#name)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [capacity](#capacity)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)

Docs/Layers/climbing_area.md

@@ -14,17 +14,11 @@ An area where climbing is possible, e.g. a crag, site, boulder, … Contains agg
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Length overview](#length-overview)
-  - [Grades overview](#grades-overview)
-  - [Contains {_contained_climbing_routes_count} routes](#contains-{_contained_climbing_routes_count}-routes)
   - [images](#images)
   - [minimap](#minimap)
   - [Contained routes length hist](#contained-routes-length-hist)
-  - [Length overview](#length-overview)
   - [Contained routes hist](#contained-routes-hist)
-  - [Grades overview](#grades-overview)
   - [Contained_climbing_routes](#contained_climbing_routes)
-  - [Contains {_contained_climbing_routes_count} routes](#contains-{_contained_climbing_routes_count}-routes)
   - [name](#name)
   - [Type](#type)
   - [Rock type (crag/rock/cliff only)](#rock-type-(cragrock/cliff-only))

Docs/Layers/climbing_club.md

@@ -13,13 +13,11 @@ A climbing club or organisation
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [climbing_club-name](#climbing_club-name)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [lod](#lod)

Docs/Layers/climbing_gym.md

@@ -13,7 +13,6 @@ A climbing gym
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [name](#name)
   - [website](#website)
@@ -22,7 +21,6 @@ A climbing gym
   - [fee](#fee)
   - [payment-options](#payment-options)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [reviews](#reviews)
   - [bouldering](#bouldering)
   - [sportclimbing](#sportclimbing)

Docs/Layers/cultural_places_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/defibrillator.md

@@ -14,7 +14,6 @@ A layer showing defibrillators which can be used in case of emergency. This cont
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [defibrillator-indoors](#defibrillator-indoors)
   - [defibrillator-access](#defibrillator-access)
@@ -27,7 +26,6 @@ A layer showing defibrillators which can be used in case of emergency. This cont
   - [defibrillator-email](#defibrillator-email)
   - [defibrillator-phone](#defibrillator-phone)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [defibrillator-description](#defibrillator-description)
   - [defibrillator-survey:date](#defibrillator-surveydate)
   - [defibrillator-fixme](#defibrillator-fixme)

Docs/Layers/dentist.md

@@ -13,10 +13,8 @@ This layer shows dentist offices
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/doctors.md

@@ -14,11 +14,9 @@ This layer shows doctor offices
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [name](#name)
   - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/dogpark.md

@@ -13,12 +13,10 @@ A layer showing dogparks, which are areas where dog are allowed to run without a
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [Name](#name)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [dogpark-fenced](#dogpark-fenced)
   - [smalldogs](#smalldogs)

Docs/Layers/drinking_water.md

@@ -15,7 +15,6 @@ A layer showing drinking water fountains
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [Still in use?](#still-in-use)
   - [fee](#fee)
@@ -24,7 +23,6 @@ A layer showing drinking water fountains
   - [temperature-cold](#temperature-cold)
   - [seasonal](#seasonal)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [bench-artwork](#bench-artwork)
   - [artwork-artwork_type](#artwork-artwork_type)
   - [artwork-artist-wikidata](#artwork-artist-wikidata)

Docs/Layers/education_institutions_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/elongated_coin.md

@@ -13,10 +13,8 @@ Layer showing penny presses.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [designs](#designs)
   - [fee](#fee)
   - [payment-options-split](#payment-options-split)

Docs/Layers/etymology.md

@@ -12,10 +12,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/fitness_centre.md

@@ -13,14 +13,12 @@ Layer showing fitness centres
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [name](#name)
   - [images](#images)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [wheelchair-access](#wheelchair-access)
   - [repeated](#repeated)
   - [single_level](#single_level)

Docs/Layers/fitness_station.md

@@ -13,13 +13,11 @@ Find a fitness station near you, and add missing ones.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [name](#name)
   - [type](#type)
   - [operator](#operator)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [lod](#lod)

Docs/Layers/food.md

@@ -14,14 +14,11 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [Name](#name)
   - [Fastfood vs restaurant](#fastfood-vs-restaurant)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
@@ -38,7 +35,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [delivery](#delivery)
   - [drive-through](#drive-through)
   - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [child_highchair](#child_highchair)
   - [kids_area](#kids_area)
   - [diets_title](#diets_title)
@@ -47,10 +43,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [lactose_free](#lactose_free)
   - [gluten_free](#gluten_free)
   - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
   - [friture-vegetarian](#friture-vegetarian)
   - [friture-vegan](#friture-vegan)
   - [friture-organic](#friture-organic)
@@ -169,8 +165,8 @@ Elements must match **any** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <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: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: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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@@ -249,10 +245,10 @@ Elements must match **any** of the following expressions:
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@@ -560,18 +556,7 @@ The question is `Does this place offer a vegan option?`
 
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`
 
  -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@@ -580,25 +565,40 @@ The question is `Does this business serve vegan meals?`
  -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
  -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`
 
  -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
  -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`
 
  -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
  -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
  -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>
 
+This tagrendering is only visible in the popup if the following condition is met: (<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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
 ### friture-vegetarian

Docs/Layers/food_courts.md

@@ -12,12 +12,10 @@ Food courts with a variety of food options.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [name](#name)
   - [reviews](#reviews)
   - [images](#images)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [wheelchair-access](#wheelchair-access)
   - [website](#website)
   - [phone](#phone)

Docs/Layers/food_dog_friendly.md

@@ -15,14 +15,11 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [Name](#name)
   - [Fastfood vs restaurant](#fastfood-vs-restaurant)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
@@ -39,7 +36,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [delivery](#delivery)
   - [drive-through](#drive-through)
   - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [child_highchair](#child_highchair)
   - [kids_area](#kids_area)
   - [diets_title](#diets_title)
@@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [lactose_free](#lactose_free)
   - [gluten_free](#gluten_free)
   - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
   - [friture-vegetarian](#friture-vegetarian)
   - [friture-vegan](#friture-vegan)
   - [friture-organic](#friture-organic)
@@ -154,8 +150,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <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: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: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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@@ -234,10 +230,10 @@ Elements must match **all** of the following expressions:
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@@ -545,18 +541,7 @@ The question is `Does this place offer a vegan option?`
 
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`
 
  -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@@ -565,25 +550,40 @@ The question is `Does this business serve vegan meals?`
  -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
  -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`
 
  -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
  -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`
 
  -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
  -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
  -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>
 
+This tagrendering is only visible in the popup if the following condition is met: (<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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
 ### friture-vegetarian

Docs/Layers/food_glutenfree.md

@@ -15,15 +15,12 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [gluten_free](#gluten_free)
   - [Name](#name)
   - [Fastfood vs restaurant](#fastfood-vs-restaurant)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
@@ -40,7 +37,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [delivery](#delivery)
   - [drive-through](#drive-through)
   - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [child_highchair](#child_highchair)
   - [kids_area](#kids_area)
   - [diets_title](#diets_title)
@@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [sugar_free](#sugar_free)
   - [lactose_free](#lactose_free)
   - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
   - [friture-vegetarian](#friture-vegetarian)
   - [friture-vegan](#friture-vegan)
   - [friture-organic](#friture-organic)
@@ -155,8 +151,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:sugar_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Asugar_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <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: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: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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@@ -235,10 +231,10 @@ Elements must match **all** of the following expressions:
 | [sugar_free](#sugar_free) <br/> _(Original in [diets](./diets.md#sugar_free))_ | Does this shop have a sugar free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@@ -546,18 +542,7 @@ The question is `Does this place offer a vegan option?`
 
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`
 
  -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@@ -566,25 +551,40 @@ The question is `Does this business serve vegan meals?`
  -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
  -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`
 
  -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
  -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`
 
  -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
  -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
  -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>
 
+This tagrendering is only visible in the popup if the following condition is met: (<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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
 ### friture-vegetarian

Docs/Layers/food_lactosefree.md

@@ -15,15 +15,12 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [lactosefree](#lactosefree)
   - [Name](#name)
   - [Fastfood vs restaurant](#fastfood-vs-restaurant)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
@@ -40,7 +37,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [delivery](#delivery)
   - [drive-through](#drive-through)
   - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [child_highchair](#child_highchair)
   - [kids_area](#kids_area)
   - [diets_title](#diets_title)
@@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [sugar_free](#sugar_free)
   - [gluten_free](#gluten_free)
   - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
   - [friture-vegetarian](#friture-vegetarian)
   - [friture-vegan](#friture-vegan)
   - [friture-organic](#friture-organic)
@@ -154,8 +150,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:sugar_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Asugar_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:sugar_free](https://wiki.openstreetmap.org/wiki/Key:diet:sugar_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:sugar_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <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: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: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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@@ -234,10 +230,10 @@ Elements must match **all** of the following expressions:
 | [sugar_free](#sugar_free) <br/> _(Original in [diets](./diets.md#sugar_free))_ | Does this shop have a sugar free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@@ -540,18 +536,7 @@ The question is `Does this place offer a vegan option?`
 
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`
 
  -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@@ -560,25 +545,40 @@ The question is `Does this business serve vegan meals?`
  -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
  -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`
 
  -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
  -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`
 
  -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
  -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
  -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>
 
+This tagrendering is only visible in the popup if the following condition is met: (<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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
 ### friture-vegetarian

Docs/Layers/friture.md

@@ -15,14 +15,11 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [Name](#name)
   - [Fastfood vs restaurant](#fastfood-vs-restaurant)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)
@@ -39,7 +36,6 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [delivery](#delivery)
   - [drive-through](#drive-through)
   - [drive-through-opening_hours](#drive-through-opening_hours)
-  - [Drive-through opening hours](#drive-through-opening-hours)
   - [child_highchair](#child_highchair)
   - [kids_area](#kids_area)
   - [diets_title](#diets_title)
@@ -48,10 +44,10 @@ A layer showing restaurants and fast-food amenities (with a special rendering fo
   - [lactose_free](#lactose_free)
   - [gluten_free](#gluten_free)
   - [vegan](#vegan)
-  - [Vegetarian (no friture)](#vegetarian-(no-friture))
-  - [Vegan (no friture)](#vegan-(no-friture))
-  - [halal (no friture)](#halal-(no-friture))
-  - [organic (no friture)](#organic-(no-friture))
+  - [vegan_food](#vegan_food)
+  - [vegetarian](#vegetarian)
+  - [halal](#halal)
+  - [organic](#organic)
   - [friture-vegetarian](#friture-vegetarian)
   - [friture-vegan](#friture-vegan)
   - [friture-organic](#friture-organic)
@@ -154,8 +150,8 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:lactose_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Alactose_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:lactose_free](https://wiki.openstreetmap.org/wiki/Key:diet:lactose_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:lactose_free%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/diet:gluten_free#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/diet%3Agluten_free/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [diet:gluten_free](https://wiki.openstreetmap.org/wiki/Key:diet:gluten_free) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:gluten_free%3Dno) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno) |
-| <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: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: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) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/organic#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/organic/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [organic](https://wiki.openstreetmap.org/wiki/Key:organic) | Multiple choice | [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) |
 | <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 | [only](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno) |
@@ -234,10 +230,10 @@ Elements must match **all** of the following expressions:
 | [lactose_free](#lactose_free) <br/> _(Original in [diets](./diets.md#lactose_free))_ | Does  have a lactose-free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [gluten_free](#gluten_free) <br/> _(Original in [diets](./diets.md#gluten_free))_ | Does this shop have a gluten free offering?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [vegan](#vegan) <br/> _(Original in [diets](./diets.md#vegan))_ | Does this place offer a vegan option?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegetarian (no friture)](#Vegetarian (no friture)) <br/> _(Original in [diets](./diets.md#Vegetarian (no friture)))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [Vegan (no friture)](#Vegan (no friture)) <br/> _(Original in [diets](./diets.md#Vegan (no friture)))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [halal (no friture)](#halal (no friture)) <br/> _(Original in [diets](./diets.md#halal (no friture)))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
-| [organic (no friture)](#organic (no friture)) <br/> _(Original in [diets](./diets.md#organic (no friture)))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegan_food](#vegan_food) <br/> _(Original in [diets](./diets.md#vegan_food))_ | Does this business serve vegan meals?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [vegetarian](#vegetarian) <br/> _(Original in [diets](./diets.md#vegetarian))_ | Does this restaurant have a vegetarian option?<br/>5 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [halal](#halal) <br/> _(Original in [diets](./diets.md#halal))_ | Does this restaurant offer a halal menu?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
+| [organic](#organic) <br/> _(Original in [diets](./diets.md#organic))_ | Does this restaurant offer organic food?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegetarian](#friture-vegetarian) <br/> _(Original in [diets](./diets.md#friture-vegetarian))_ | Does this fries shop have vegetarian snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-vegan](#friture-vegan) <br/> _(Original in [diets](./diets.md#friture-vegan))_ | Does this fries shop have vegan snacks?<br/>4 options | diets, diets-content, hidden | _Multiple choice only_ |
 | [friture-organic](#friture-organic) <br/> _(Original in [diets](./diets.md#friture-organic))_ | Does this fries shop offer organic snacks?<br/>3 options | diets, diets-content, hidden | _Multiple choice only_ |
@@ -545,18 +541,7 @@ The question is `Does this place offer a vegan option?`
 
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### Vegetarian (no friture)
-The question is `Does this restaurant have a vegetarian option?`
-
- -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
- -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
- - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
- -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
-
-This tagrendering has labels `diets` `diets-content` `hidden`
-
-### Vegan (no friture)
+### vegan_food
 The question is `Does this business serve vegan meals?`
 
  -  *No vegan options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Dno' target='_blank'>no</a>
@@ -565,25 +550,40 @@ The question is `Does this business serve vegan meals?`
  -  *All dishes are vegan* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Donly' target='_blank'>only</a>
  -  *Some dishes might be adapted to a vegan version if asked for* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegan' target='_blank'>diet:vegan</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegan%3Don_demand' target='_blank'>on_demand</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### halal (no friture)
+### vegetarian
+The question is `Does this restaurant have a vegetarian option?`
+
+ -  *No vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dno' target='_blank'>no</a>
+ -  *Some vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dlimited' target='_blank'>limited</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *Vegetarian options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/food/Vegetarian-mark.svg'> *All dishes are vegetarian* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Donly' target='_blank'>only</a>
+ -  *Some dishes might be adapted to a vegetarian version, but this should be demanded* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:vegetarian' target='_blank'>diet:vegetarian</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:vegetarian%3Don_demand' target='_blank'>on_demand</a>
+
+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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
+This tagrendering has labels `diets` `diets-content` `hidden`
+
+### halal
 The question is `Does this restaurant offer a halal menu?`
 
  -  *There are no halal options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dno' target='_blank'>no</a>
  -  *There is a small halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dlimited' target='_blank'>limited</a>
- -  *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
- -  *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *There is a halal menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Dyes' target='_blank'>yes</a>
+ - <img width='38px' height='38px' src='https://dev.mapcomplete.org/./assets/layers/diets/halal.svg'> *Only halal options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:diet:halal' target='_blank'>diet:halal</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:diet:halal%3Donly' target='_blank'>only</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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
-### organic (no friture)
+### organic
 The question is `Does this restaurant offer organic food?`
 
  -  *There are no organic options available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno' target='_blank'>no</a>
  -  *There is an organic menu* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes' target='_blank'>yes</a>
  -  *Only organic options are available* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:organic' target='_blank'>organic</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly' target='_blank'>only</a>
 
+This tagrendering is only visible in the popup if the following condition is met: (<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> | <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>) & cuisine!=friture
 This tagrendering has labels `diets` `diets-content` `hidden`
 
 ### friture-vegetarian

Docs/Layers/ghost_bike.md

@@ -13,7 +13,6 @@ A layer showing memorials for cyclists, killed in road accidents
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the deceased person](#wikipedia-page-about-the-deceased-person)
   - [preset_description](#preset_description)
   - [images_no_blur](#images_no_blur)
   - [ghost_bike-name](#ghost_bike-name)
@@ -21,7 +20,6 @@ A layer showing memorials for cyclists, killed in road accidents
   - [ghost_bike-inscription](#ghost_bike-inscription)
   - [ghost_bike-start_date](#ghost_bike-start_date)
   - [wikidata](#wikidata)
-  - [Wikipedia page about the deceased person](#wikipedia-page-about-the-deceased-person)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [delete-button](#delete-button)

Docs/Layers/hackerspace.md

@@ -13,7 +13,6 @@ Hackerspace
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [is_makerspace](#is_makerspace)
@@ -25,7 +24,6 @@ Hackerspace
   - [phone](#phone)
   - [mastodon](#mastodon)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [hackerspaces-service-3dprinter](#hackerspaces-service-3dprinter)
   - [hackerspaces-service-lasercutter](#hackerspaces-service-lasercutter)
   - [hackerspaces-service-cnc_drilling_machine](#hackerspaces-service-cnc_drilling_machine)

Docs/Layers/health_and_social_places_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/historic_aircraft.md

@@ -11,17 +11,13 @@
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [images](#images)
   - [model](#model)
   - [is_memorial](#is_memorial)
   - [memorial-type](#memorial-type)
   - [inscription](#inscription)
   - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
   - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [delete-button](#delete-button)

Docs/Layers/historic_rolling_stock.md

@@ -13,8 +13,6 @@ Historic rolling stock (such as locomotives, railway cars and wagons) which are
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [images](#images)
   - [preset_type](#preset_type)
   - [wikipedia](#wikipedia)
@@ -23,9 +21,7 @@ Historic rolling stock (such as locomotives, railway cars and wagons) which are
   - [memorial-type](#memorial-type)
   - [inscription](#inscription)
   - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
   - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [delete-button](#delete-button)

Docs/Layers/hospital.md

@@ -12,7 +12,6 @@ A layer showing hospital grounds
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours for visitors](#opening-hours-for-visitors)
   - [name](#name)
   - [inpatient](#inpatient)
   - [phone](#phone)
@@ -25,7 +24,6 @@ A layer showing hospital grounds
   - [unit](#unit)
   - [address-questions](#address-questions)
   - [oh-visitor](#oh-visitor)
-  - [Opening hours for visitors](#opening-hours-for-visitors)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)
   - [lod](#lod)

Docs/Layers/ice_cream.md

@@ -14,12 +14,10 @@ A place where ice cream is sold over the counter
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [1](#1)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/icecream_glutenfree.md

@@ -15,13 +15,11 @@ A place where ice cream is sold over the counter
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [gluten_free](#gluten_free)
   - [1](#1)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/icecream_lactosefree.md

@@ -15,13 +15,11 @@ A place where ice cream is sold over the counter
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [lactosefree](#lactosefree)
   - [1](#1)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/indoors.md

@@ -13,8 +13,6 @@ Basic indoor mapping: shows room outlines
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [repeated](#repeated)
   - [single_level](#single_level)
@@ -23,13 +21,11 @@ Basic indoor mapping: shows room outlines
   - [room-type](#room-type)
   - [room-capacity](#room-capacity)
   - [wikipedia-etymology](#wikipedia-etymology)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [toilet-access](#toilet-access)
   - [toilets-fee](#toilets-fee)
   - [toilet-charge](#toilet-charge)
   - [payment-options-split](#payment-options-split)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [toilets-type](#toilets-type)
   - [toilets-disposal](#toilets-disposal)
   - [gender_segregated](#gender_segregated)

Docs/Layers/medical_shops.md

@@ -16,7 +16,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
@@ -24,7 +23,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/memorial.md

@@ -14,15 +14,11 @@ Layer showing memorial plaques, based upon a unofficial theme. Can be expanded t
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [images_no_blur](#images_no_blur)
   - [memorial-type](#memorial-type)
   - [inscription](#inscription)
   - [memorial-wikidata](#memorial-wikidata)
-  - [Wikipedia page about the memorial](#wikipedia-page-about-the-memorial)
   - [subject-wikidata](#subject-wikidata)
-  - [Wikipedia page about the remembered event or person](#wikipedia-page-about-the-remembered-event-or-person)
   - [start_date](#start_date)
   - [bench-backrest](#bench-backrest)
   - [bench-armrest](#bench-armrest)

Docs/Layers/note.md

@@ -17,12 +17,10 @@ This layer is loaded from an external source, namely
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Nearby images](#nearby-images)
   - [conversation](#conversation)
   - [add_image](#add_image)
   - [comment](#comment)
   - [nearby-images](#nearby-images)
-  - [Nearby images](#nearby-images)
   - [report-contributor](#report-contributor)
   - [report-note](#report-note)
   - [leftover-questions](#leftover-questions)

Docs/Layers/outdoor_seating.md

@@ -12,12 +12,10 @@ Outdoor seating areas, usually located near cafes and restaurants.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [access](#access)
   - [seasonal](#seasonal)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [internet](#internet)
   - [internet-fee](#internet-fee)

Docs/Layers/parcel_lockers.md

@@ -13,12 +13,10 @@ Layer showing parcel lockers for collecting and sending parcels.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [brand](#brand)
   - [operator](#operator)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [ref](#ref)
   - [mail-in](#mail-in)
   - [pickup](#pickup)

Docs/Layers/parks_and_forests_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/parks_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/pet_shops.md

@@ -16,7 +16,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
@@ -24,7 +23,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/pharmacy.md

@@ -14,12 +14,10 @@ A layer showing pharmacies, which (probably) dispense prescription drugs
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [name](#name)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/physiotherapist.md

@@ -13,11 +13,9 @@ This layer shows physiotherapists
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [name](#name)
   - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/police.md

@@ -13,7 +13,6 @@ Many types of police facilities
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [police_name](#police_name)
@@ -22,7 +21,6 @@ Many types of police facilities
   - [email](#email)
   - [website](#website)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [4_z2nrdhy6tyyh4fd](#4_z2nrdhy6tyyh4fd)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)

Docs/Layers/post_offices_with_atm.md

@@ -14,13 +14,11 @@ A layer showing post offices.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [post_partner](#post_partner)
   - [post_offic_brand](#post_offic_brand)
   - [partner-brand](#partner-brand)

Docs/Layers/postoffices.md

@@ -13,13 +13,11 @@ A layer showing post offices.
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [post_partner](#post_partner)
   - [post_offic_brand](#post_offic_brand)
   - [partner-brand](#partner-brand)

Docs/Layers/recycling.md

@@ -13,7 +13,6 @@ A layer with recycling containers and centres
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [recycling-type](#recycling-type)
   - [recycling-centre-name](#recycling-centre-name)
@@ -24,7 +23,6 @@ A layer with recycling containers and centres
   - [email](#email)
   - [phone](#phone)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [access](#access)
   - [colour](#colour)
   - [survey_date](#survey_date)

Docs/Layers/shop_dog_friendly.md

@@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
@@ -23,7 +22,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/shops.md

@@ -14,7 +14,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
@@ -22,7 +21,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/shops_glutenfree.md

@@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [gluten_free](#gluten_free)
@@ -24,7 +23,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/shops_lactosefree.md

@@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [lactosefree](#lactosefree)
@@ -24,7 +23,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/shops_second_hand.md

@@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
@@ -23,7 +22,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/shops_with_climbing_shoe_repair.md

@@ -15,7 +15,6 @@ A shop
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [repairs_climbing_shoes](#repairs_climbing_shoes)
   - [images](#images)
   - [reviews](#reviews)
@@ -24,7 +23,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/shower.md

@@ -13,7 +13,6 @@ A layer showing (public) showers
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [repeated](#repeated)
   - [single_level](#single_level)
@@ -21,7 +20,6 @@ A layer showing (public) showers
   - [fee](#fee)
   - [charge](#charge)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [hot_water](#hot_water)
   - [payment-options-split](#payment-options-split)
   - [has_grab_rail_lr](#has_grab_rail_lr)

Docs/Layers/souvenir_coin.md

@@ -13,10 +13,8 @@ Layer showing machines selling souvenir coins
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [designs](#designs)
   - [payment-options-split](#payment-options-split)
   - [website](#website)

Docs/Layers/souvenir_note.md

@@ -13,10 +13,8 @@ Layer showing machines selling souvenir banknotes
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [designs](#designs)
   - [payment-options-split](#payment-options-split)
   - [website](#website)

Docs/Layers/sport_places_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/sport_shops.md

@@ -16,7 +16,6 @@ A shop
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
@@ -24,7 +23,6 @@ A shop
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [email](#email)
   - [phone](#phone)

Docs/Layers/sports_centre.md

@@ -13,10 +13,8 @@ Indoor and outdoor sports centres can be found on this layer
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [website](#website)
   - [email](#email)

Docs/Layers/streets_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/stripclub.md

@@ -13,12 +13,10 @@ A venue where erotic dance, striptease, or lap dances are performed commercially
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [reviews](#reviews)
   - [name](#name)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)

Docs/Layers/toilet.md

@@ -34,7 +34,6 @@ A layer showing (public) toilets
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [toilet-reviews](#toilet-reviews)
   - [repeated](#repeated)
@@ -44,7 +43,6 @@ A layer showing (public) toilets
   - [toilet-charge](#toilet-charge)
   - [payment-options-split](#payment-options-split)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [toilets-type](#toilets-type)
   - [toilets-disposal](#toilets-disposal)
   - [gender_segregated](#gender_segregated)

Docs/Layers/toilet_at_amenity.md

@@ -12,7 +12,6 @@ A layer showing (public) toilets located at different places.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images_toilet](#images_toilet)
   - [toilets_repeated](#toilets_repeated)
   - [toilets_single_level](#toilets_single_level)
@@ -25,7 +24,6 @@ A layer showing (public) toilets located at different places.
   - [toilets_description](#toilets_description)
   - [toilets_toilets-wheelchair](#toilets_toilets-wheelchair)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [toilets-type](#toilets-type)
   - [toilets-disposal](#toilets-disposal)
   - [menstrual_products](#menstrual_products)

Docs/Layers/tool_library.md

@@ -13,14 +13,12 @@ A tool library is a place where people from the general public can borrow tools
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [phone](#phone)
   - [email](#email)
   - [website](#website)
   - [facebook](#facebook)
   - [opening_hours_by_appointment](#opening_hours_by_appointment)
-  - [Opening hours](#opening-hours)
   - [membership](#membership)
   - [membership_charge](#membership_charge)
   - [fee](#fee)

Docs/Layers/toursistic_places_without_etymology.md

@@ -14,10 +14,8 @@ All objects which have an etymology known
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Wikipedia article of the name giver](#wikipedia-article-of-the-name-giver)
   - [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)

Docs/Layers/transit_stops.md

@@ -12,7 +12,6 @@ Layer showing different types of transit stops.
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [{_contained_routes_count} routes stop at this stop](#{_contained_routes_count}-routes-stop-at-this-stop)
   - [stop_name](#stop_name)
   - [images](#images)
   - [shelter](#shelter)
@@ -23,7 +22,6 @@ Layer showing different types of transit stops.
   - [lit](#lit)
   - [departures_board](#departures_board)
   - [contained_routes](#contained_routes)
-  - [{_contained_routes_count} routes stop at this stop](#{_contained_routes_count}-routes-stop-at-this-stop)
   - [leftover-questions](#leftover-questions)
   - [lod](#lod)
 5. [Filters](#filters)

Docs/Layers/vending_machine.md

@@ -13,14 +13,12 @@ Layer showing vending machines
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [repeated](#repeated)
   - [single_level](#single_level)
   - [vending](#vending)
   - [bicycle_tube_vending_machine-brand](#bicycle_tube_vending_machine-brand)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [payment-options-split](#payment-options-split)
   - [denominations-coins](#denominations-coins)
   - [denominations-notes](#denominations-notes)

Docs/Layers/vending_machine_bicycle.md

@@ -14,14 +14,12 @@ Layer showing vending machines
 2. [Basic tags for this layer](#basic-tags-for-this-layer)
 3. [Supported attributes](#supported-attributes)
 4. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [images](#images)
   - [repeated](#repeated)
   - [single_level](#single_level)
   - [vending](#vending)
   - [bicycle_tube_vending_machine-brand](#bicycle_tube_vending_machine-brand)
   - [opening_hours_24_7](#opening_hours_24_7)
-  - [Opening hours](#opening-hours)
   - [payment-options-split](#payment-options-split)
   - [denominations-coins](#denominations-coins)
   - [denominations-notes](#denominations-notes)

Docs/Layers/veterinary.md

@@ -13,12 +13,10 @@ A layer showing veterinarians
 3. [Basic tags for this layer](#basic-tags-for-this-layer)
 4. [Supported attributes](#supported-attributes)
 5. [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-  - [Opening hours](#opening-hours)
   - [website](#website)
   - [reviews](#reviews)
   - [phone](#phone)
   - [opening_hours](#opening_hours)
-  - [Opening hours](#opening-hours)
   - [vetName](#vetname)
   - [leftover-questions](#leftover-questions)
   - [move-button](#move-button)

Docs/SpecialInputElements.md

@@ -12,33 +12,18 @@ The listed types here trigger a special input element. Use them in `tagrendering
 6. [distance](#distance)
 7. [direction](#direction)
 8. [Input helper](#input-helper)
-9. [wikidata](#wikidata)
   - [Helper arguments](#helper-arguments)
     + [Suboptions](#suboptions)
   - [Example usage](#example-usage)
-10. [pnat](#pnat)
-11. [float](#float)
-12. [pfloat](#pfloat)
-13. [email](#email)
-14. [url](#url)
-15. [phone](#phone)
-16. [opening_hours](#opening_hours)
+9. [pnat](#pnat)
+10. [float](#float)
+11. [pfloat](#pfloat)
+12. [email](#email)
+13. [url](#url)
+14. [phone](#phone)
+15. [opening_hours](#opening_hours)
   - [Helper arguments](#helper-arguments)
   - [Example usage](#example-usage)
-17. [color](#color)
-18. [image](#image)
-19. [simple_tag](#simple_tag)
-20. [tag](#tag)
-21. [key](#key)
-22. [translation](#translation)
-23. [icon](#icon)
-24. [fediverse](#fediverse)
-25. [id](#id)
-26. [slope](#slope)
-27. [velopark](#velopark)
-28. [nsi](#nsi)
-29. [currency](#currency)
-30. [regex](#regex)
 
 ### string
 A simple piece of text which is at most 255 characters long

Docs/SpecialRenderings.md

@@ -11,6 +11,18 @@ General usage is `{func_name()}`, `{func_name(arg, someotherarg)}` or `{func_nam
 1. [Special tag renderings](#special-tag-renderings)
 2. [Using expanded syntax](#using-expanded-syntax)
 3. [Overview of all special components](#overview-of-all-special-components)
+  - [UI](#ui)
+    + [braced](#braced)
+    + [title](#title)
+    + [translated](#translated)
+  - [data](#data)
+    + [all_tags](#all_tags)
+    + [canonical](#canonical)
+    + [direction_absolute](#direction_absolute)
+    + [direction_indicator](#direction_indicator)
+    + [opening_hours_state](#opening_hours_state)
+    + [opening_hours_table](#opening_hours_table)
+    + [statistics](#statistics)
   - [data_import](#data_import)
     + [auto_apply](#auto_apply)
     + [compare_data](#compare_data)
@@ -28,6 +40,7 @@ General usage is `{func_name()}`, `{func_name(arg, someotherarg)}` or `{func_nam
     + [minimap](#minimap)
     + [move_button](#move_button)
     + [qr_code](#qr_code)
+    + [questions](#questions)
     + [share_link](#share_link)
     + [split_button](#split_button)
   - [favourites](#favourites)
@@ -39,6 +52,8 @@ General usage is `{func_name()}`, `{func_name(arg, someotherarg)}` or `{func_nam
     + [nearby_images](#nearby_images)
   - [notes](#notes)
     + [add_image_to_note](#add_image_to_note)
+    + [add_note_comment](#add_note_comment)
+    + [close_note](#close_note)
     + [open_note](#open_note)
     + [visualize_note_comments](#visualize_note_comments)
   - [reviews](#reviews)
@@ -48,6 +63,7 @@ General usage is `{func_name()}`, `{func_name(arg, someotherarg)}` or `{func_nam
     + [reviews](#reviews)
   - [settings](#settings)
     + [clear_caches](#clear_caches)
+    + [clear_location_history](#clear_location_history)
     + [disabled_questions](#disabled_questions)
     + [gps_all_tags](#gps_all_tags)
     + [gyroscope_all_tags](#gyroscope_all_tags)
@@ -72,28 +88,14 @@ General usage is `{func_name()}`, `{func_name(arg, someotherarg)}` or `{func_nam
     + [wikidata_label](#wikidata_label)
     + [wikipedia](#wikipedia)
   - [Unclassified elements](#unclassified-elements)
-    + [add_note_comment](#add_note_comment)
-    + [all_tags](#all_tags)
-    + [braced](#braced)
-    + [canonical](#canonical)
-    + [clear_location_history](#clear_location_history)
-    + [close_note](#close_note)
-    + [direction_absolute](#direction_absolute)
-    + [direction_indicator](#direction_indicator)
     + [export_as_geojson](#export_as_geojson)
     + [export_as_gpx](#export_as_gpx)
     + [histogram](#histogram)
     + [language_chooser](#language_chooser)
     + [multi_apply](#multi_apply)
-    + [opening_hours_state](#opening_hours_state)
-    + [opening_hours_table](#opening_hours_table)
     + [preset_description](#preset_description)
     + [preset_type_select](#preset_type_select)
-    + [questions](#questions)
-    + [statistics](#statistics)
     + [tags](#tags)
-    + [title](#title)
-    + [translated](#translated)
     + [upload_to_osm](#upload_to_osm)
 
 # Using expanded syntax
@@ -127,6 +129,141 @@ In other words: use `{ "before": ..., "after": ..., "special": {"type": ..., "ar
 
 # Overview of all special components
 
+## UI
+
+### braced
+
+Show a literal text within braces
+
+| name | default | description |
+-----|-----|----- |
+| text | _undefined_ | The value to show |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of braced
+
+`{braced()}`
+
+### title
+
+Shows the title of the popup. Useful for some cases, e.g. 'What is phone number of {title()}?'
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of title
+
+`What is the phone number of {title()}`, which might automatically become `What is the phone number of XYZ`.
+
+### translated
+
+If the given key can be interpreted as a JSON, only show the key containing the current language (or 'en'). This specialRendering is meant to be used by MapComplete studio and is not useful in map themes
+
+| name | default | description |
+-----|-----|----- |
+| key | value | The attribute to interpret as json |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of translated
+
+`{translated(value)}`
+
+## data
+
+Visualises data of a POI, sometimes with data updating capabilities
+
+### all_tags
+
+Prints all key-value pairs of the object - used for debugging
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of all_tags
+
+`{all_tags()}`
+
+### canonical
+
+Converts a short, canonical value into the long, translated text including the unit. This only works if a `unit` is defined for the corresponding value. The unit specification will be included in the text. 
+
+| name | default | description |
+-----|-----|----- |
+| key | _undefined_ | The key of the tag to give the canonical text for |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of canonical
+
+If the object has `length=42`, then `{canonical(length)}` will be shown as **42 meter** (in english), **42 metre** (in french), ...
+
+### direction_absolute
+
+Converts compass degrees (with 0° being north, 90° being east, ...) into a human readable, translated direction such as 'north', 'northeast'
+
+| name | default | description |
+-----|-----|----- |
+| key | _direction:centerpoint | The attribute containing the degrees |
+| offset | 0 | Offset value that is added to the actual value, e.g. `180` to indicate the opposite (backward) direction |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of direction_absolute
+
+`{direction_absolute(_direction:centerpoint,0)}`
+
+### direction_indicator
+
+Gives a distance indicator and a compass pointing towards the location from your GPS-location. If clicked, centers the map on the object
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of direction_indicator
+
+`{direction_indicator()}`
+
+### opening_hours_state
+
+A small element, showing if the POI is currently open and when the next change is
+
+| name | default | description |
+-----|-----|----- |
+| key | opening_hours | The tagkey from which the opening hours are read. |
+| prefix | _empty string_ | Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__ |
+| postfix | _empty string_ | Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__ |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of opening_hours_state
+
+`{opening_hours_state(opening_hours,,)}`
+
+### opening_hours_table
+
+Creates an opening-hours table. Usage: {opening_hours_table(opening_hours)} to create a table of the tag 'opening_hours'.
+
+| name | default | description |
+-----|-----|----- |
+| key | opening_hours | The tagkey from which the table is constructed. |
+| prefix | _empty string_ | Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__ |
+| postfix | _empty string_ | Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__ |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of opening_hours_table
+
+A normal opening hours table can be invoked with `{opening_hours_table()}`. A table for e.g. conditional access with opening hours can be `{opening_hours_table(access:conditional, no @ &LPARENS, &RPARENS)}`
+
+### statistics
+
+Show general statistics about all the elements currently in view. Intended to use on the `current_view`-layer. They will be split per layer
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of statistics
+
+`{statistics()}`
+
 ## data_import
 
 Elements to help with importing data to OSM. For example: buttons to import a feature, apply tags on an element, apply multiple tags on an element or to work with maproulette
@@ -149,6 +286,8 @@ Elements to help with importing data to OSM. For example: buttons to import a fe
 | text | _undefined_ | The text to show on the button |
 | icon | ./assets/svg/robot.svg | The icon to show on the button |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of auto_apply
 
 `{auto_apply(,,,,./assets/svg/robot.svg)}`
@@ -163,6 +302,8 @@ Gives an interactive element which shows a tag comparison between the OSM-object
 | host | _undefined_ | The domain name(s) where data might be fetched from - this is needed to set the CSP. A domain must include 'https', e.g. 'https://example.com'. For multiple domains, separate them with ';'. If you don't know the possible domains, use '*'.  |
 | readonly | _undefined_ | If 'yes', will not show 'apply'-buttons |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of compare_data
 
 `{compare_data(,,)}`
@@ -221,6 +362,8 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
 | icon | ./assets/svg/addSmall.svg | A nice icon to show in the button |
 | way_to_conflate | _undefined_ | The key, of which the corresponding value is the id of the OSM-way that must be conflated; typically a calculatedTag |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of conflate_button
 
 `{conflate_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,)}`
@@ -283,6 +426,8 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
 | 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 |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of import_button
 
 `{import_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,,5,,,)}`
@@ -346,6 +491,8 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
 | snap_onto_layers | _undefined_ | If no existing nearby point exists, but a line of a specified layer is closeby, snap to this layer instead |
 | snap_to_layer_max_distance | 0.1 | Distance to distort the geometry to snap to this layer |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of import_way_button
 
 `{import_way_button(,,Import this data into OpenStreetMap,./assets/svg/addSmall.svg,,0.05,,0.05,,0.1)}`
@@ -362,6 +509,8 @@ Attempts to load (via a proxy) the specified website and parsed ld+json from the
 | mode | _undefined_ | If `display`, only show the data in tabular and readonly form, ignoring already existing tags. This is used to explicitly show all the tags. If unset or anything else, allow to apply/import on OSM |
 | collapsed | yes | If the containing accordion should be closed |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of linked_data_from_website
 
 `{linked_data_from_website(website,yes,,,yes)}`
@@ -379,6 +528,8 @@ Change the status of the given MapRoulette task
 | maproulette_id | mr_taskId | The property name containing the maproulette id |
 | ask_feedback | _empty string_ | If not an empty string, this will be used as question to ask some additional feedback. A text field will be added |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of maproulette_set_status
 
  The following example sets the status to '2' (false positive)
@@ -407,6 +558,8 @@ Sends the images linked to the current object to plantnet.org and asks it what p
 -----|-----|----- |
 | image_key | image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image,image | The keys given to the images, e.g. if <span class='literal-code'>image</span> is given, the first picture URL will be added as <span class='literal-code'>image</span>, the second as <span class='literal-code'>image:0</span>, the third as <span class='literal-code'>image:1</span>, etc... Multiple values are allowed if ';'-separated  |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of plantnet_detection
 
 `{plantnet_detection(image,mapillary,image,wikidata,wikimedia_commons,image,panoramax,image,image)}`
@@ -436,6 +589,8 @@ Note that these values can be prepare with javascript in the theme by using a [c
 | id_of_object_to_apply_this_one | _undefined_ | If specified, applies the the tags onto _another_ object. The id will be read from properties[id_of_object_to_apply_this_one] of the selected object. The tags are still calculated based on the tags of the _selected_ element |
 | maproulette_id | _undefined_ | If specified, this maproulette-challenge will be closed when the tags are applied. This should be the `id` of the individual task, _not_ the task_id (which corresponds with the challenge). |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of tag_apply
 
 `{tag_apply(survey_date=$_now:date, Surveyed today!)}`, `{tag_apply(addr:street=$addr:street, Apply the address, apply_icon.svg, _closest_osm_id)
@@ -448,6 +603,8 @@ These special visualisations are (mostly) interactive components that most eleme
 
 An element which allows to add a new point on the 'last_click'-location. Only makes sense in the layer `last_click`
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of add_new_point
 
 `{add_new_point()}`
@@ -456,6 +613,8 @@ An element which allows to add a new point on the 'last_click'-location. Only ma
 
 Adds a button which allows to delete the object at this location. The config will be read from the layer config
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of delete_button
 
 `{delete_button()}`
@@ -469,6 +628,8 @@ Shows a 'nothing is currently known-message if there is at least one unanswered
 | text | _undefined_ | Text to show |
 | cssClasses | _undefined_ | Classes to apply onto the text |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of if_nothing_known
 
 `{if_nothing_known(,)}`
@@ -482,6 +643,8 @@ A small map showing the selected feature.
 | zoomlevel | 18 | The (maximum) zoomlevel: the target zoomlevel after fitting the entire feature. The minimap will fit the entire feature, then zoom out to this zoom level. The higher, the more zoomed in with 1 being the entire world and 19 being really close |
 | idKey | id | (Matches all resting arguments) This argument should be the key of a property of the feature. The corresponding value is interpreted as either the id or the a list of ID's. The features with these ID's will be shown on this minimap. (Note: if the key is 'id', list interpration is disabled) |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of minimap
 
 `{minimap()}`, `{minimap(17, id, _list_of_embedded_feature_ids_calculated_by_calculated_tag):height:10rem; border: 2px solid black}`
@@ -490,6 +653,8 @@ A small map showing the selected feature.
 
 Adds a button which allows to move the object to another location. The config will be read from the layer config
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of move_button
 
 `{move_button()}`
@@ -503,10 +668,28 @@ Generates a QR-code to share the selected object
 | text | _undefined_ | Extra text on the side of the QR-code |
 | textClass | _undefined_ | CSS class of the the side text |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of qr_code
 
 `{qr_code(,)}`
 
+### questions
+
+The special element which shows the questions which are unknown. Added by default if not yet there
+
+| name | default | description |
+-----|-----|----- |
+| labels | _undefined_ | One or more ';'-separated labels. If these are given, only questions with these labels will be given. Use `unlabeled` for all questions that don't have an explicit label. If none given, all questions will be shown |
+| blacklisted-labels | _undefined_ | One or more ';'-separated labels of questions which should _not_ be included. Note that the questionbox which is added by default will blacklist 'hidden'. If both a whitelist and a blacklist are given, will show questions having at least one label from the whitelist but none of the blacklist. |
+| show_all | _undefined_ | Either `no`, `yes` or `user-preference`. Indicates if all questions should be shown at once |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of questions
+
+`{questions(,,)}`
+
 ### share_link
 
 Creates a link that (attempts to) open the native 'share'-screen
@@ -516,6 +699,8 @@ Creates a link that (attempts to) open the native 'share'-screen
 | url | _undefined_ | The url to share (default: current URL) |
 | text | _undefined_ | The text to show on the button. If none is given, will act as a titleIcon |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of share_link
 
 {share_link()} to share the current page, {share_link(<some_url>)} to share the given url
@@ -524,6 +709,8 @@ Creates a link that (attempts to) open the native 'share'-screen
 
 Adds a button which allows to split a way
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of split_button
 
 `{split_button()}`
@@ -536,6 +723,8 @@ Elements relating to marking an object as favourite (giving it a heart). Default
 
 A small button that allows a (logged in) contributor to mark a location as a favourite location, sized to fit a title-icon
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of favourite_icon
 
 `{favourite_icon()}`
@@ -544,6 +733,8 @@ A small button that allows a (logged in) contributor to mark a location as a fav
 
 A button that allows a (logged in) contributor to mark a location as a favourite location
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of favourite_status
 
 `{favourite_status()}`
@@ -560,13 +751,15 @@ Creates an image carousel for the given sources. An attempt will be made to gues
 -----|-----|----- |
 | image_key | image;mapillary;image;wikidata;wikimedia_commons;image;panoramax;image;image | The keys given to the images, e.g. if <span class='literal-code'>image</span> is given, the first picture URL will be added as <span class='literal-code'>image</span>, the second as <span class='literal-code'>image:0</span>, the third as <span class='literal-code'>image:1</span>, etc... Multiple values are allowed if ';'-separated  |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of image_carousel
 
 `{image_carousel(image;mapillary;image;wikidata;wikimedia_commons;image;panoramax;image;image)}`
 
 ### image_upload
 
-Creates a button where a user can upload an image to IMGUR
+Creates a button where a user can upload an image to panoramax
 
 | name | default | description |
 -----|-----|----- |
@@ -574,6 +767,8 @@ Creates a button where a user can upload an image to IMGUR
 | label | _undefined_ | The text to show on the button |
 | disable_blur | _undefined_ | If set to 'true' or 'yes', then face blurring will be disabled. To be used sparingly |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of image_upload
 
 `{image_upload(panoramax,,)}`
@@ -587,6 +782,8 @@ A component showing nearby images loaded from various online services such as Ma
 | mode | closed | Either `open` or `closed`. If `open`, then the image carousel will always be shown |
 | readonly | _undefined_ | If 'readonly' or 'yes', will not show the 'link'-button |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of nearby_images
 
 `{nearby_images(closed,)}`
@@ -603,14 +800,51 @@ Adds an image to a node
 -----|-----|----- |
 | Id-key | id | The property name where the ID of the note to close can be found |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of add_image_to_note
 
 `{add_image_to_note(id)}`
 
+### add_note_comment
+
+A textfield to add a comment to a node (with the option to close the note).
+
+| name | default | description |
+-----|-----|----- |
+| Id-key | id | The property name where the ID of the note to close can be found |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of add_note_comment
+
+`{add_note_comment(id)}`
+
+### close_note
+
+Button to close a note. A predefined text can be defined to close the note with. If the note is already closed, will show a small text.
+
+| name | default | description |
+-----|-----|----- |
+| text | _undefined_ | Text to show on this button |
+| icon | checkmark.svg | Icon to show |
+| idkey | id | The property name where the ID of the note to close can be found |
+| comment | _undefined_ | Text to add onto the note when closing |
+| minZoom | _undefined_ | If set, only show the closenote button if zoomed in enough |
+| zoomButton | _undefined_ | Text to show if not zoomed in enough |
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of close_note
+
+`{close_note(,checkmark.svg,id,,,)}`
+
 ### open_note
 
 Creates a new map note on the given location. This options is placed in the 'last_click'-popup automatically if the 'notes'-layer is enabled
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of open_note
 
 `{open_note()}`
@@ -624,6 +858,8 @@ Visualises the comments for notes
 | commentsKey | comments | The property name of the comments, which should be stringified json |
 | start | 0 | Drop the first 'start' comments |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of visualize_note_comments
 
 `{visualize_note_comments(comments,0)}`
@@ -642,6 +878,8 @@ Invites the contributor to leave a review. Somewhat small UI-element until inter
 | fallback | _undefined_ | The identifier to use, if <i>tags[subjectKey]</i> as specified above is not available. This is effectively a fallback value |
 | question | _undefined_ | The question to ask during the review |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of create_review
 
 `{create_review(name,,)}`
@@ -655,6 +893,8 @@ Adds an overview of the mangrove-reviews of this object. Mangrove.Reviews needs
 | subjectKey | name | The key to use to determine the subject. If specified, the subject will be <b>tags[subjectKey]</b> |
 | fallback | _undefined_ | The identifier to use, if <i>tags[subjectKey]</i> as specified above is not available. This is effectively a fallback value |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of list_reviews
 
 `{list_reviews(name,)}`
@@ -668,6 +908,8 @@ Shows stars which represent the average rating on mangrove.
 | subjectKey | name | The key to use to determine the subject. If the value is specified, the subject will be <b>tags[subjectKey]</b> and will use this to filter the reviews. |
 | fallback | _undefined_ | The identifier to use, if <i>tags[subjectKey]</i> as specified above is not available. This is effectively a fallback value |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of rating
 
 `{rating(name,)}`
@@ -682,6 +924,8 @@ A pragmatic combination of `create_review` and `list_reviews`
 | fallback | _undefined_ | The identifier to use, if <i>tags[subjectKey]</i> as specified above is not available. This is effectively a fallback value |
 | question | _undefined_ | The question to ask in the review form. Optional |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of reviews
 
 `{reviews()}` for a vanilla review, `{reviews(name, play_forest)}` to review a play forest. If a name is known, the name will be used as identifier, otherwise 'play_forest' is used
@@ -698,14 +942,28 @@ A button which clears the locally downloaded data and the service worker. Login
 -----|-----|----- |
 | text | _undefined_ | The text to show on the button |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of clear_caches
 
 `{clear_caches()}`
 
+### clear_location_history
+
+A button to remove the travelled track information from the device
+
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
+#### Example usage of clear_location_history
+
+`{clear_location_history()}`
+
 ### disabled_questions
 
 Shows which questions are disabled for every layer. Used in 'settings'
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of disabled_questions
 
 `{disabled_questions()}`
@@ -714,6 +972,8 @@ Shows which questions are disabled for every layer. Used in 'settings'
 
 Shows the current tags of the GPS-representing object, used for debugging
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of gps_all_tags
 
 `{gps_all_tags()}`
@@ -722,6 +982,8 @@ Shows the current tags of the GPS-representing object, used for debugging
 
 Shows the current tags of the GPS-representing object, used for debugging
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of gyroscope_all_tags
 
 `{gyroscope_all_tags()}`
@@ -734,6 +996,8 @@ Only makes sense in the usersettings. Allows to import a mangrove public key and
 -----|-----|----- |
 | text | _undefined_ | The text that is shown on the button |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of import_mangrove_key
 
 `{import_mangrove_key()}`
@@ -742,6 +1006,8 @@ Only makes sense in the usersettings. Allows to import a mangrove public key and
 
 A component to set the language of the user interface
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of language_picker
 
 `{language_picker()}`
@@ -755,6 +1021,8 @@ Show a login button
 | force | _undefined_ | Always show this button, even if logged in |
 | message | _undefined_ | Message to display on the button |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of login_button
 
 `{login_button(,)}`
@@ -763,6 +1031,8 @@ Show a login button
 
 Shows a button where the user can log out
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of logout
 
 `{logout()}`
@@ -771,6 +1041,8 @@ Shows a button where the user can log out
 
 A module showing the pending changes, with the option to clear the pending changes
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of pending_changes
 
 `{pending_changes()}`
@@ -784,6 +1056,8 @@ A QR-code which shares the current URL and adds the login token. Anyone with thi
 | text | _undefined_ | Extra text on the side of the QR-code |
 | textClass | _undefined_ | CSS class of the the side text |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of qr_login
 
 `{qr_login(,)}`
@@ -792,6 +1066,8 @@ A QR-code which shares the current URL and adds the login token. Anyone with thi
 
 Shows the current state of storage
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of storage_all_tags
 
 `{storage_all_tags()}`
@@ -810,6 +1086,8 @@ A collapsable group (accordion)
 | labels | _undefined_ | A `;`-separated list of either identifiers or label names. All tagRenderings matching this value will be shown in the accordion |
 | blacklist | _undefined_ | A `;`-separated list of either identifiers or label names. Matching tagrenderings will _not_ be included, even if they are in `labels` |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of group
 
 `{group(,,)}`
@@ -824,6 +1102,8 @@ Given an embedded tagRendering (read only) and a key, will read the keyname as a
 | tagrendering | _undefined_ | An entire tagRenderingConfig |
 | classes | _undefined_ | CSS-classes to apply on every individual item. Seperated by `space` |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of multi
 
 ```json
@@ -844,6 +1124,8 @@ Given an embedded tagRendering (read only) and a key, will read the keyname as a
 
 Opens the current view in the iD-editor
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of open_in_iD
 
 `{open_in_iD()}`
@@ -852,6 +1134,8 @@ Opens the current view in the iD-editor
 
 Opens the current view in the JOSM-editor
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of open_in_josm
 
 `{open_in_josm()}`
@@ -865,6 +1149,8 @@ Shows a tagRendering from a different object as if this was the object itself
 | featureId | _undefined_ | The key of the attribute which contains the id of the feature from which to use the tags |
 | tagRenderingId | _undefined_ | The layer-id and tagRenderingId to render. Can be multiple value if ';'-separated (in which case every value must also contain the layerId, e.g. `layerId.tagRendering0; layerId.tagRendering1`). Note: this can cause layer injection |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of steal
 
 `{steal(,)}`
@@ -881,6 +1167,8 @@ Converts a fediverse username or link into a clickable link
 -----|-----|----- |
 | key | _undefined_ | The attribute-name containing the link |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of fediverse_link
 
 `{fediverse_link()}`
@@ -898,6 +1186,8 @@ Construct a link. By using the 'special' visualisation notation, translations sh
 | arialabel | _undefined_ | If set, this text will be used as aria-label |
 | icon | _undefined_ | If set, show this icon next to the link. You might want to combine this with `class: button` |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of link
 
 `{link(,,,,,)}`
@@ -910,6 +1200,8 @@ Adds a button to open mapillary on the specified location
 -----|-----|----- |
 | zoom | 18 | The startzoom of mapillary |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of mapillary_link
 
 `{mapillary_link(18)}`
@@ -925,6 +1217,8 @@ Creates a `mailto`-link where some fields are already set and correctly escaped.
 | body | _undefined_ | The text in the email |
 | button_text | _undefined_ | The text shown on the button in the UI |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of send_email
 
 `{send_email(,,,)}`
@@ -937,6 +1231,8 @@ Shows the label of the corresponding wikidata-item
 -----|-----|----- |
 | keyToShowWikidataFor | wikidata | Use the wikidata entry from this key to show the label |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of wikidata_label
 
 `{wikidata_label()}` is a basic example, `{wikipedia(name:etymology:wikidata)}` to show the label itself
@@ -949,6 +1245,8 @@ A box showing the corresponding wikipedia article(s) - based on the **wikidata**
 -----|-----|----- |
 | keyToShowWikipediaFor | wikidata;wikipedia | Use the wikidata entry from this key to show the wikipedia article for. Multiple keys can be given (separated by ';'), in which case the first matching value is used |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of wikipedia
 
 `{wikipedia()}` is a basic example, `{wikipedia(name:etymology:wikidata)}` to show the wikipedia page of whom the feature was named after. Also remember that these can be styled, e.g. `{wikipedia():max-height: 10rem}` to limit the height
@@ -957,100 +1255,12 @@ A box showing the corresponding wikipedia article(s) - based on the **wikidata**
 
 Various elements
 
-### add_note_comment
-
-A textfield to add a comment to a node (with the option to close the note).
-
-| name | default | description |
------|-----|----- |
-| Id-key | id | The property name where the ID of the note to close can be found |
-
-#### Example usage of add_note_comment
-
-`{add_note_comment(id)}`
-
-### all_tags
-
-Prints all key-value pairs of the object - used for debugging
-
-#### Example usage of all_tags
-
-`{all_tags()}`
-
-### braced
-
-Show a literal text within braces
-
-| name | default | description |
------|-----|----- |
-| text | _undefined_ | The value to show |
-
-#### Example usage of braced
-
-`{braced()}`
-
-### canonical
-
-Converts a short, canonical value into the long, translated text including the unit. This only works if a `unit` is defined for the corresponding value. The unit specification will be included in the text. 
-
-| name | default | description |
------|-----|----- |
-| key | _undefined_ | The key of the tag to give the canonical text for |
-
-#### Example usage of canonical
-
-If the object has `length=42`, then `{canonical(length)}` will be shown as **42 meter** (in english), **42 metre** (in french), ...
-
-### clear_location_history
-
-A button to remove the travelled track information from the device
-
-#### Example usage of clear_location_history
-
-`{clear_location_history()}`
-
-### close_note
-
-Button to close a note. A predefined text can be defined to close the note with. If the note is already closed, will show a small text.
-
-| name | default | description |
------|-----|----- |
-| text | _undefined_ | Text to show on this button |
-| icon | checkmark.svg | Icon to show |
-| idkey | id | The property name where the ID of the note to close can be found |
-| comment | _undefined_ | Text to add onto the note when closing |
-| minZoom | _undefined_ | If set, only show the closenote button if zoomed in enough |
-| zoomButton | _undefined_ | Text to show if not zoomed in enough |
-
-#### Example usage of close_note
-
-`{close_note(,checkmark.svg,id,,,)}`
-
-### direction_absolute
-
-Converts compass degrees (with 0° being north, 90° being east, ...) into a human readable, translated direction such as 'north', 'northeast'
-
-| name | default | description |
------|-----|----- |
-| key | _direction:centerpoint | The attribute containing the degrees |
-| offset | 0 | Offset value that is added to the actual value, e.g. `180` to indicate the opposite (backward) direction |
-
-#### Example usage of direction_absolute
-
-`{direction_absolute(_direction:centerpoint,0)}`
-
-### direction_indicator
-
-Gives a distance indicator and a compass pointing towards the location from your GPS-location. If clicked, centers the map on the object
-
-#### Example usage of direction_indicator
-
-`{direction_indicator()}`
-
 ### export_as_geojson
 
 Exports the selected feature as GeoJson-file
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of export_as_geojson
 
 `{export_as_geojson()}`
@@ -1059,6 +1269,8 @@ Exports the selected feature as GeoJson-file
 
 Exports the selected feature as GPX-file
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of export_as_gpx
 
 `{export_as_gpx()}`
@@ -1074,6 +1286,8 @@ Create a histogram for a list of given values, read from the properties.
 | countHeader | _empty string_ | This text will be placed above the bars |
 | colors* | _undefined_ | (Matches all resting arguments - optional) Matches a regex onto a color value, e.g. `3[a-zA-Z+-]*:#33cc33` |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of histogram
 
 `{histogram('some_key')}` with properties being `{some_key: ["a","b","a","c"]} to create a histogram
@@ -1091,9 +1305,21 @@ The language element allows to show and pick all known (modern) languages. The k
 | render_all | {list()} | The full rendering. Use `{list}` to show where the list of languages must come. Optional if mode=single |
 | no_known_languages | _undefined_ | The text that is shown if no languages are known for this key. If this text is omitted, the languages will be prompted instead |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of language_chooser
 
-`{language_chooser(,,{language()},,{list()},)}`
+    ```json
+     {"special":
+       "type": "language_chooser",
+       "key": "school:language",
+       "question": {"en": "What are the main (and administrative) languages spoken in this school?"},
+       "render_single_language": {"en": "{language()} is spoken on this school"},
+       "render_list_item": {"en": "{language()}"},
+       "render_all": {"en": "The following languages are spoken here:{list()}"}
+     }
+     ```
+    
 
 ### multi_apply
 
@@ -1107,42 +1333,18 @@ A button to apply the tagging of this object onto a list of other features. This
 | autoapply | _undefined_ | A boolean indicating wether this tagging should be applied automatically if the relevant tags on this object are changed. A visual element indicating the multi_apply is still shown |
 | overwrite | _undefined_ | If set to 'true', the tags on the other objects will always be overwritten. The default behaviour will be to only change the tags on other objects if they are either undefined or had the same value before the change |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of multi_apply
 
 {multi_apply(_features_with_the_same_name_within_100m, name:etymology:wikidata;name:etymology, Apply etymology information on all nearby objects with the same name)}
 
-### opening_hours_state
-
-A small element, showing if the POI is currently open and when the next change is
-
-| name | default | description |
------|-----|----- |
-| key | opening_hours | The tagkey from which the opening hours are read. |
-| prefix | _empty string_ | Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__ |
-| postfix | _empty string_ | Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__ |
-
-#### Example usage of opening_hours_state
-
-`{opening_hours_state(opening_hours,,)}`
-
-### opening_hours_table
-
-Creates an opening-hours table. Usage: {opening_hours_table(opening_hours)} to create a table of the tag 'opening_hours'.
-
-| name | default | description |
------|-----|----- |
-| key | opening_hours | The tagkey from which the table is constructed. |
-| prefix | _empty string_ | Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to indicate `(` if needed__ |
-| postfix | _empty string_ | Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__ |
-
-#### Example usage of opening_hours_table
-
-A normal opening hours table can be invoked with `{opening_hours_table()}`. A table for e.g. conditional access with opening hours can be `{opening_hours_table(access:conditional, no @ &LPARENS, &RPARENS)}`
-
 ### preset_description
 
 Shows the extra description from the presets of the layer, if one matches. It will pick the most specific one (e.g. if preset `A` implies `B`, but `B` does not imply `A`, it'll pick B) or the first one if no ordering can be made. Might be empty
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of preset_description
 
 `{preset_description()}`
@@ -1151,32 +1353,12 @@ Shows the extra description from the presets of the layer, if one matches. It wi
 
 An editable tag rendering which allows to change the type
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of preset_type_select
 
 `{preset_type_select()}`
 
-### questions
-
-The special element which shows the questions which are unknown. Added by default if not yet there
-
-| name | default | description |
------|-----|----- |
-| labels | _undefined_ | One or more ';'-separated labels. If these are given, only questions with these labels will be given. Use `unlabeled` for all questions that don't have an explicit label. If none given, all questions will be shown |
-| blacklisted-labels | _undefined_ | One or more ';'-separated labels of questions which should _not_ be included. Note that the questionbox which is added by default will blacklist 'hidden'. If both a whitelist and a blacklist are given, will show questions having at least one label from the whitelist but none of the blacklist. |
-| show_all | _undefined_ | Either `no`, `yes` or `user-preference`. Indicates if all questions should be shown at once |
-
-#### Example usage of questions
-
-`{questions(,,)}`
-
-### statistics
-
-Show general statistics about all the elements currently in view. Intended to use on the `current_view`-layer. They will be split per layer
-
-#### Example usage of statistics
-
-`{statistics()}`
-
 ### tags
 
 Shows a (json of) tags in a human-readable way + links to the wiki
@@ -1185,34 +1367,18 @@ Shows a (json of) tags in a human-readable way + links to the wiki
 -----|-----|----- |
 | key | value | The key to look for the tags |
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of tags
 
 `{tags(value)}`
 
-### title
-
-Shows the title of the popup. Useful for some cases, e.g. 'What is phone number of {title()}?'
-
-#### Example usage of title
-
-`What is the phone number of {title()}`, which might automatically become `What is the phone number of XYZ`.
-
-### translated
-
-If the given key can be interpreted as a JSON, only show the key containing the current language (or 'en'). This specialRendering is meant to be used by MapComplete studio and is not useful in map themes
-
-| name | default | description |
------|-----|----- |
-| key | value | The attribute to interpret as json |
-
-#### Example usage of translated
-
-`{translated(value)}`
-
 ### upload_to_osm
 
 Uploads the GPS-history as GPX to OpenStreetMap.org; clears the history afterwards. The actual feature is ignored.
 
+Defined in [/src/UI/SpecialVisualization.ts#L98](/home/pietervdvn/git/MapComplete/src/UI/SpecialVisualization.ts)
+
 #### Example usage of upload_to_osm
 
 `{upload_to_osm()}`

Docs/Tags_format.md

@@ -13,26 +13,6 @@ fine (`"if": "brand~[Bb]randname", "then":" The brand is Brandname"`); but this
 into the database. The theme loader will however refuse to work with such inconsistencies and notify you of this while
 you are building your theme.
 
-## Table of contents
-
-1. [Example](#example)
-2. [= strict equality](#=-strict-equality)
-  - [If key is not present](#if-key-is-not-present)
-  - [Removing a key](#removing-a-key)
-3. [!= strict not equals](#!=-strict-not-equals)
-  - [If key is present](#if-key-is-present)
-4. [~ Value matches regex](#~-value-matches-regex)
-5. [~i~ Value matches case-invariant regex](#~i~-value-matches-case-invariant-regex)
-6. [!~ Value should not match regex](#!~-value-should-not-match-regex)
-7. [!~i~ Value does not match case-invariant regex](#!~i~-value-does-not-match-case-invariant-regex)
-8. [~~ Key and value should match given regex](#~~-key-and-value-should-match-given-regex)
-9. [~i~~ Key and value should match a given regex; value is case-invariant](#~i~~-key-and-value-should-match-a-given-regex-value-is-case-invariant)
-10. [!~i~~ Key and value should match a given regex; value is case-invariant](#!~i~~-key-and-value-should-match-a-given-regex-value-is-case-invariant)
-11. [:= Substitute ... {some_key} ... and match key](#=-substitute-...-{some_key}-...-and-match-key)
-12. [!:= Substitute {some_key} should not match key](#!=-substitute-{some_key}-should-not-match-key)
-13. [<= >= < > Logical comparators](#<=->=-<->-logical-comparators)
-14. [Logical operators](#logical-operators)
-
 Example
 -------
 
@@ -64,6 +44,25 @@ Strict equality is denoted by `key=value`. This key matches __only if__ the keyp
 
 If a different kind of tag specification is given, your theme will fail to parse.
 
+### Table of contents
+
+1. [= strict equality](#=-strict-equality)
+  - [If key is not present](#if-key-is-not-present)
+  - [Removing a key](#removing-a-key)
+2. [!= strict not equals](#!=-strict-not-equals)
+  - [If key is present](#if-key-is-present)
+3. [~ Value matches regex](#~-value-matches-regex)
+4. [~i~ Value matches case-invariant regex](#~i~-value-matches-case-invariant-regex)
+5. [!~ Value should not match regex](#!~-value-should-not-match-regex)
+6. [!~i~ Value does not match case-invariant regex](#!~i~-value-does-not-match-case-invariant-regex)
+7. [~~ Key and value should match given regex](#~~-key-and-value-should-match-given-regex)
+8. [~i~~ Key and value should match a given regex; value is case-invariant](#~i~~-key-and-value-should-match-a-given-regex-value-is-case-invariant)
+9. [!~i~~ Key and value should match a given regex; value is case-invariant](#!~i~~-key-and-value-should-match-a-given-regex-value-is-case-invariant)
+10. [:= Substitute ... {some_key} ... and match key](#=-substitute-...-{some_key}-...-and-match-key)
+11. [!:= Substitute {some_key} should not match key](#!=-substitute-{some_key}-should-not-match-key)
+12. [<= >= < > Logical comparators](#<=->=-<->-logical-comparators)
+13. [Logical operators](#logical-operators)
+
 ### If key is not present
 
 If you want to check if a key is not present, use `key=` (pronounce as *key is empty*). A tag collection will match this

Docs/Themes/atm.md

@@ -57,13 +57,11 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [Opening hours](#opening-hours)
     + [images](#images)
     + [phone](#phone)
     + [email](#email)
     + [website](#website)
     + [opening_hours](#opening_hours)
-    + [Opening hours](#opening-hours)
     + [post_partner](#post_partner)
     + [post_offic_brand](#post_offic_brand)
     + [partner-brand](#partner-brand)

Docs/Themes/bag.md

@@ -52,15 +52,11 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [BAG geometry:](#bag-geometry)
-    + [OSM geometry:](#osm-geometry)
     + [Import button](#import-button)
     + [Reference](#reference)
     + [Build year](#build-year)
     + [Building type](#building-type)
     + [Overlapping building](#overlapping-building)
-    + [BAG geometry:](#bag-geometry)
-    + [OSM geometry:](#osm-geometry)
     + [Building status](#building-status)
     + [Buidling function](#buidling-function)
     + [leftover-questions](#leftover-questions)

Docs/Themes/circular_economy.md

@@ -42,7 +42,6 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [Opening hours](#opening-hours)
     + [images](#images)
     + [reviews](#reviews)
     + [shops-name](#shops-name)
@@ -50,7 +49,6 @@ Available languages:
     + [brand](#brand)
     + [second_hand](#second_hand)
     + [opening_hours](#opening_hours)
-    + [Opening hours](#opening-hours)
     + [website](#website)
     + [email](#email)
     + [phone](#phone)

Docs/Themes/climbing.md

@@ -47,7 +47,6 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [Opening hours](#opening-hours)
     + [repairs_climbing_shoes](#repairs_climbing_shoes)
     + [images](#images)
     + [reviews](#reviews)
@@ -56,7 +55,6 @@ Available languages:
     + [brand](#brand)
     + [second_hand](#second_hand)
     + [opening_hours](#opening_hours)
-    + [Opening hours](#opening-hours)
     + [website](#website)
     + [email](#email)
     + [phone](#phone)

Docs/Themes/cyclofix.md

@@ -56,12 +56,10 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [Opening hours](#opening-hours)
     + [images](#images)
     + [preset_description](#preset_description)
     + [name](#name)
     + [opening_hours_by_appointment](#opening_hours_by_appointment)
-    + [Opening hours](#opening-hours)
     + [phone](#phone)
     + [email](#email)
     + [website](#website)
@@ -77,14 +75,12 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [Opening hours](#opening-hours)
     + [images](#images)
     + [bicycle_rental_type](#bicycle_rental_type)
     + [website](#website)
     + [email](#email)
     + [phone](#phone)
     + [opening_hours](#opening_hours)
-    + [Opening hours](#opening-hours)
     + [payment-options](#payment-options)
     + [payment-options-advanced](#payment-options-advanced)
     + [bicycle-types](#bicycle-types)
@@ -104,8 +100,6 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [Opening hours](#opening-hours)
-    + [Technical questions](#technical-questions)
     + [images](#images)
     + [Type](#type)
     + [access](#access)
@@ -196,7 +190,6 @@ Available languages:
     + [current-socket:nacs](#current-socketnacs)
     + [power-output-socket:nacs](#power-output-socketnacs)
     + [OH](#oh)
-    + [Opening hours](#opening-hours)
     + [fee](#fee)
     + [charge](#charge)
     + [payment-options](#payment-options)
@@ -216,7 +209,6 @@ Available languages:
     + [Parking:fee](#parkingfee)
     + [questions](#questions)
     + [questions-technical](#questions-technical)
-    + [Technical questions](#technical-questions)
     + [move-button](#move-button)
     + [delete-button](#delete-button)
     + [lod](#lod)
@@ -225,14 +217,12 @@ Available languages:
   - [Basic tags for this layer](#basic-tags-for-this-layer)
   - [Supported attributes](#supported-attributes)
   - [Featureview elements and TagRenderings](#featureview-elements-and-tagrenderings)
-    + [Opening hours](#opening-hours)
     + [images](#images)
     + [repeated](#repeated)
     + [single_level](#single_level)
     + [vending](#vending)
     + [bicycle_tube_vending_machine-brand](#bicycle_tube_vending_machine-brand)
     + [opening_hours_24_7](#opening_hours_24_7)
-    + [Opening hours](#opening-hours)
     + [payment-options-split](#payment-options-split)
     + [denominations-coins](#denominations-coins)
     + [denominations-notes](#denominations-notes)