From 9cbd704ca586c3b4ad4a4c3e4530e6f889f54b5c Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Fri, 6 Sep 2024 20:24:00 +0000
Subject: [PATCH 1/9] Translated using Weblate (German)

Currently translated at 100.0% (675 of 675 strings)

Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/de/
---
 langs/de.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/langs/de.json b/langs/de.json
index 16671edcb..8f8d55f2e 100644
--- a/langs/de.json
+++ b/langs/de.json
@@ -19,7 +19,7 @@
     "delete": {
         "cancel": "Abbrechen",
         "cannotBeDeleted": "Dieses Element kann nicht gelöscht werden",
-        "delete": "Löschen",
+        "delete": "Objekt löschen",
         "deletedTitle": "Gelöschtes Objekt",
         "explanations": {
             "hardDelete": "Dieses Objekt wird in OpenStreetMap gelöscht. Es kann von einem erfahrenen Mitwirkenden wiederhergestellt werden",
@@ -200,9 +200,9 @@
             "mapillaryHelp": "<b>Mapillary</b> ist ein Online-Dienst, der Straßenbilder sammelt und sie unter einer freien Lizenz anbietet. Mitwirkende dürfen diese Bilder verwenden, um OpenStreetMap zu verbessern",
             "openIssueTracker": "Fehler melden",
             "openMapillary": "Mapillary öffnen",
-            "openOsmcha": "Neueste Bearbeitungen mit {theme} ansehen",
+            "openOsmcha": "Neueste Bearbeitungen mit Thema {theme} ansehen",
             "openOsmchaLastWeek": "Bearbeitungen der letzten 7 Tage anzeigen",
-            "openThemeDocumentation": "Dokumentation für Themenkarte {name} öffnen",
+            "openThemeDocumentation": "Dokumentation zum Thema {name} öffnen",
             "seeOnMapillary": "Dieses Bild auf Mapillary ansehen",
             "themeBy": "Dieses Thema wurde erstellt von {author}",
             "title": "Copyright und Urheberrechtsangabe",
@@ -228,7 +228,7 @@
             },
             "downloadAsPdf": "Aktuelle Karte als PDF herunterladen",
             "downloadAsPdfHelper": "Ideal zum Drucken der aktuellen Karte",
-            "downloadAsPng": "Als Bild herunterladen",
+            "downloadAsPng": "Als Bild (PNG) herunterladen",
             "downloadAsPngHelper": "Am besten geeignet, um in Berichten zu verwenden",
             "downloadAsSvg": "Aktuelle Karte als SVG herunterladen",
             "downloadAsSvgHelper": "Kompatibel mit Inkscape oder Adobe Illustrator; Weiterbearbeitung erforderlich",
@@ -250,7 +250,7 @@
             "pdf": {
                 "current_view_generic": "PDF der aktuellen Karte in {paper_size} im {orientation} Format herunterladen"
             },
-            "title": "Download",
+            "title": "Karte herunterladen",
             "toMuch": "Es gibt zu viele Funktionen, um sie alle herunterzuladen",
             "uploadGpx": "Einen Track auf OpenStreetMap hochladen"
         },

From 73c840ca7929d1ae58280eff3bcf0ba7aaedf420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Podhoreck=C3=BD?= <j.podhorecky@volny.cz>
Date: Thu, 5 Sep 2024 13:13:46 +0000
Subject: [PATCH 2/9] Translated using Weblate (Czech)

Currently translated at 99.2% (670 of 675 strings)

Translation: MapComplete/Core
Translate-URL: https://hosted.weblate.org/projects/mapcomplete/core/cs/
---
 langs/cs.json | 83 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 17 deletions(-)

diff --git a/langs/cs.json b/langs/cs.json
index d38abdca4..e5294a30c 100644
--- a/langs/cs.json
+++ b/langs/cs.json
@@ -193,6 +193,7 @@
             },
             "josmNotOpened": "JOSM se nepodařilo propojit. Ujistěte se, že je otevřený a že je povoleno dálkové ovládání",
             "josmOpened": "JOSM je otevřen",
+            "madeBy": "Vytvořeno od <b>{author}</b>",
             "mapContributionsBy": "Aktuální viditelná data obsahují úpravy provedené uživateli {contributors}",
             "mapContributionsByAndHidden": "Aktuální viditelná data obsahují úpravy provedené {contributors} a {hiddenCount} dalšími přispěvateli",
             "mapDataByOsm": "Mapová data: OpenStreetMap",
@@ -208,7 +209,7 @@
             "translatedBy": "MapComplete přeložili {contributors} a <a href='https://github.com/pietervdvn/MapComplete/graphs/contributors' target='_blank'>{hiddenCount} dalších přispěvatelů</a>"
         },
         "back": "Zpět",
-        "backToIndex": "Návrat na přehled všech tematických map",
+        "backToIndex": "Zobrazit všechny tematické mapy",
         "backToMap": "Zpět na mapu",
         "backgroundMap": "Vyberte vrstvu pozadí",
         "backgroundSwitch": "Přepnout pozadí",
@@ -241,6 +242,7 @@
             "downloadGeojson": "Stáhnout viditelná data jako GeoJSON",
             "downloadGpx": "Stáhnout jako soubor GPX",
             "downloadGpxHelper": "Soubor GPX lze použít s většinou navigačních zařízení a aplikací",
+            "downloadImage": "Stáhnout obrázek",
             "exporting": "Exportování…",
             "includeMetaData": "Zahrnout metadata (poslední editor, vypočtené hodnoty, ...)",
             "licenseInfo": "<h3>Upozornění na autorská práva</h3>Poskytovaná data jsou dostupná pod ODbL. Opětovné použití je zdarma pro jakýkoli účel, ale <ul><li>musí být uveden zdroj <b>© přispěvatelé OpenStreetMap</b><li><li>Jakákoli změna musí být publikována pod stejnou licencí</li>< /ul> Podrobnosti naleznete v úplném <a href='https://www.openstreetmap.org/copyright' target='_blank'>upozornění na autorská práva</a>.",
@@ -299,8 +301,12 @@
         "logout": "Odhlásit se",
         "mappingsAreHidden": "Některé možnosti jsou skryté. Pomocí vyhledávání zobrazíte další možnosti.",
         "menu": {
+            "aboutCurrentThemeTitle": "O této mapě",
             "aboutMapComplete": "O MapComplete",
-            "filter": "Filtrování dat"
+            "filter": "Filtrování dat",
+            "moreUtilsTitle": "Zjistit více",
+            "showIntroduction": "Zobrazit úvod",
+            "title": "Menu"
         },
         "morescreen": {
             "createYourOwnTheme": "Vytvořte si vlastní téma MapComplete",
@@ -408,7 +414,8 @@
             "fsGeolocation": "Povolit geolokaci",
             "fsUserbadge": "Povolit přihlašovací tlačítko a tím i možnost provádět změny",
             "fsWelcomeMessage": "Zobrazit vyskakovací okno s uvítací zprávou a související karty",
-            "intro": "<h3>Sdílejte tuto mapu</h3> Sdílejte tuto mapu zkopírováním níže uvedeného odkazu a jeho zasláním přátelům a rodině:",
+            "intro": "Sdílejte tuto mapu zkopírováním níže uvedeného odkazu a jeho zasláním přátelům a rodině:",
+            "openInOtherApplications": "Otevřete aktuální polohu pomocí jiné mapové aplikace",
             "openLayers": "Otevřete nabídku vrstev a filtrů",
             "options": "Možnosti sdílení",
             "stateIsIncluded": "Aktuální stav vrstev a filtrů je zahrnut ve sdíleném odkazu a prvku iframe.",
@@ -537,11 +544,18 @@
         "openLayersPanel": "Otevírá panel Vrstvy pozadí",
         "queryCurrentLocation": "Zobrazte adresu, která je nejblíže středu mapy",
         "selectAerial": "Nastavte pozadí na letecké nebo satelitní snímky. Přepíná mezi dvěma nejlepšími dostupnými vrstvami",
+        "selectFavourites": "Otevřít stránku oblíbených položek",
+        "selectItem": "Vyberte bod zájmu, který je nejblíže středu mapy (křížek). Pouze při použití klávesnicové navigace",
+        "selectItem2": "Vyberte bod zájmu, který je druhým nejbližším prvkem ke středu mapy (křížek). Pouze při použití klávesnicové navigace",
+        "selectItem3": "Vyberte bod zájmu, který je třetím nejbližším prvkem ke středu mapy (křížek). Pouze při použití klávesnicové navigace",
+        "selectItemI": "Vyberte bod zájmu, který je {i}tým nejbližším prvkem ke středu mapy (křížek). Pouze při použití klávesnicové navigace",
         "selectMap": "Nastavení pozadí na mapu z externích zdrojů. Přepíná mezi dvěma nejlepšími dostupnými vrstvami",
         "selectMapnik": "Nastavení vrstvy pozadí na OpenStreetMap-carto",
         "selectOsmbasedmap": "Nastavení vrstvy pozadí na mapu založenou na OpenStreetMap (nebo vypnutí rastrové vrstvy pozadí)",
         "selectSearch": "Vybere vyhledávací řádek pro vyhledávání míst",
-        "title": "Klávesové zkratky"
+        "shakePhone": "Zatřesení telefonem",
+        "title": "Klávesové zkratky",
+        "translationMode": "Zapnutí nebo vypnutí režimu překladu"
     },
     "image": {
         "addPicture": "Přidat fotku",
@@ -550,8 +564,11 @@
         "dontDelete": "Zrušit",
         "isDeleted": "Smazáno",
         "nearby": {
+            "close": "Sbalení panelu s okolními obrázky",
+            "failed": "Získání obrázků ze služby {service} se nezdařilo",
             "link": "Tento obrázek zobrazuje objekt",
-            "seeNearby": "Procházení a propojování okolních obrázků",
+            "noNearbyImages": "Nebyly nalezeny žádné obrázky v okolí",
+            "seeNearby": "Procházet okolní obrázky",
             "title": "Blízké obrázky streetview"
         },
         "pleaseLogin": "Pro přidání fotky se prosím přihlaste",
@@ -594,14 +611,16 @@
     },
     "index": {
         "#": "Tyto texty se zobrazují nad tlačítky motivu, pokud není načten žádný motiv",
+        "about": "O MapComplete",
         "featuredThemeTitle": "Tento týden",
-        "intro": "MapComplete je prohlížeč a editor OpenStreetMap, který zobrazuje informace o prvcích konkrétního tématu a umožňuje je aktualizovat.",
+        "intro": "Mapy k různým tématům, ke kterým přispíváte",
+        "learnMore": "Více informací",
         "logIn": "Přihlaste se, abyste viděli další témata, která jste dříve navštívili",
         "pickTheme": "Vyberte si téma níže a začněte.",
-        "title": "Vítejte v MapComplete"
+        "title": "MapComplete"
     },
     "move": {
-        "cancel": "Zrušit přesun",
+        "cancel": "Vyberte jiný důvod",
         "cannotBeMoved": "Tuto funkci nelze přesunout.",
         "confirmMove": "Přesunout sem",
         "inviteToMove": {
@@ -618,7 +637,7 @@
         "partOfRelation": "Tato funkce je součástí vztahu. K přesunutí použijte jiný editor.",
         "pointIsMoved": "Bod byl přesunut",
         "reasons": {
-            "reasonInaccurate": "Umístění tohoto objektu je nepřesné a mělo by být posunuto o několik metrů",
+            "reasonInaccurate": "Poloha je nepřesná o několik metrů",
             "reasonRelocation": "Objekt byl přemístěn na úplně jiné místo"
         },
         "selectReason": "Proč přesouváte tento objekt?",
@@ -681,6 +700,11 @@
         "takeImages": "Pořizujte snímky stromu, abyste automaticky zjistili typ stromu",
         "tryAgain": "Vyberte jiný druh"
     },
+    "preset_type": {
+        "question": "Jakého typu je tento objekt?",
+        "typeDescription": "To je <b>{title}</b>. <div class='subtle'>{description}</div>",
+        "typeTitle": "To je <b>{title}</b>"
+    },
     "privacy": {
         "editingIntro": "Když v mapě provedete změnu, tato změna se zaznamená na OpenStreetMap a je veřejně dostupná komukoli. Sada změn provedená pomocí MapComplete obsahuje následující data:",
         "editingOutro": "Viz <a href='https://wiki.osmfoundation.org/wiki/Privacy_Policy' target='_blank'>zásady ochrany osobních údajů na OpenStreetMap.org</a> pro podrobné informace. Rádi bychom vám připomněli, že při registraci můžete použít smyšlené jméno.",
@@ -706,22 +730,33 @@
     },
     "reviews": {
         "affiliated_reviewer_warning": "(Recenze od zaměstnance)",
-        "attribution": "Recenze jsou poskytovány službou <a href='https://mangrove.reviews/' target='_blank'>Mangrove Reviews</a> a jsou k dispozici pod licencí <a href='https://mangrove.reviews/terms#8-licensing-of-content' target='_blank'>CC-BY 4.0</a>.",
+        "attribution": "Od <a href='https://mangrove.reviews/' target='_blank'>Mangrove Reviews</a>",
+        "averageRating": "Průměrné hodnocení {n} hvězdiček",
         "i_am_affiliated": "Jsem spojen s tímto objektem",
         "i_am_affiliated_explanation": "Zkontrolujte, zda jste vlastníkem, tvůrcem, zaměstnancem, …",
         "name_required": "Pro zobrazení a vytváření recenzí je vyžadováno jméno",
-        "no_reviews_yet": "Zatím zde nejsou žádné recenze. Buďte první, kdo ji napíše, a pomozte otevřít data a podnikání!",
+        "no_reviews_yet": "Zatím nejsou žádné recenze. Buďte první!",
+        "non_place_review": "Jedna recenze se netýká místa a není zde uvedena.",
+        "non_place_reviews": "{n} recenzí se netýkají místa a nejsou zde zobrazeny.",
         "question": "Jak byste ohodnotili {title()}?",
         "question_opinion": "Jaká byla vaše zkušenost?",
+        "rate": "Ohodnotit {n} hvězdičkami",
+        "rated": "Hodnoceno {n} hvězdičkami",
+        "reviewPlaceholder": "Popište svou zkušenost…",
         "reviewing_as": "Přezkoumání jako {nickname}",
         "reviewing_as_anonymous": "Kontrola jako anonymní",
-        "save": "Uložit",
+        "reviews_bug": "Očekávali jste více recenzí? Některé recenze se nezobrazují kvůli chybě.",
+        "save": "Uložit recenzi",
         "saved": "Recenze uložena. Díky za sdílení!",
         "saving_review": "Ukládání…",
+        "see_all": "Zobrazit všechny recenze na mangrove.reviews",
         "title": "{count} recenzí",
         "title_singular": "Jedna recenze",
+        "too_long": "Povoleno je maximálně {max} znaků. Vaše recenze má {amount} znaků.",
         "tos": "Zanecháním recenze souhlasíte s <a href='https://mangrove.reviews/terms' target='_blank'>podmínkami a zásadami ochrany osobních údajů služby Mangrove.reviews</a>",
-        "write_a_comment": "Zanechte recenzi…"
+        "write_a_comment": "Zanechte recenzi…",
+        "your_reviews": "Vaše předchozí recenze",
+        "your_reviews_empty": "Nenašli jsme žádné z vašich předchozích hodnocení"
     },
     "split": {
         "cancel": "Zrušit",
@@ -765,12 +800,18 @@
         "fediverse": {
             "description": "Fediverse adresa, často @username@server.tld",
             "feedback": "Fediverse adresa se skládá z @username@server.tld nebo je odkazem na profil",
-            "invalidHost": "{host} není platný název hostitele"
+            "invalidHost": "{host} není platný název hostitele",
+            "onYourServer": "Zobrazit a sledovat na serveru"
         },
         "float": {
             "description": "nějaké číslo",
             "feedback": "To není číslo"
         },
+        "id": {
+            "description": "identifikátor",
+            "invalidCharacter": "ID může obsahovat pouze písmena, číslice a podtržítka",
+            "shouldBeLonger": "Id by mělo mít alespoň 3 znaky"
+        },
         "int": {
             "description": "celé číslo"
         },
@@ -795,6 +836,10 @@
             "description": "celé kladné číslo",
             "noZero": "Nula není povolena"
         },
+        "slope": {
+            "inputExplanation": "Položte telefon na zem tak, aby horní strana telefonu směřovala k horní části svahu.",
+            "inputIncorrect": "Pro správné měření se ujistěte, že se šipka nachází v zelené oblasti."
+        },
         "string": {
             "description": "kus textu"
         },
@@ -803,11 +848,15 @@
         },
         "tooLong": "Text je příliš dlouhý, povoleno je maximálně 255 znaků. Nyní máte {count} znaků.",
         "url": {
+            "aggregator": "{host} je webová stránka třetí strany. Pokud je to možné, vyhledejte oficiální webové stránky.",
             "description": "odkaz na webové stránky",
-            "feedback": "Toto není platná webová adresa"
+            "feedback": "Toto není platná webová adresa",
+            "spamSite": "{host} je považován za nekvalitní webovou stránku. Používání této webové stránky není povoleno."
         },
         "wikidata": {
-            "description": "A Wikidata identifikátor"
+            "description": "A Wikidata identifikátor",
+            "empty": "Zadejte prosím nějaká wikidata",
+            "startsWithQ": "Identifikátor wikidat začíná písmenem Q a následuje za ním číslo"
         }
     }
-}
\ No newline at end of file
+}

From 2932118018c3560954d2b24c53414224a936541c Mon Sep 17 00:00:00 2001
From: Thomas <gohthom4s@yahoo.com>
Date: Wed, 4 Sep 2024 18:57:26 +0000
Subject: [PATCH 3/9] Translated using Weblate (Chinese (Min Nan) (nan))

Currently translated at 0.1% (1 of 675 strings)

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

diff --git a/langs/nan.json b/langs/nan.json
index 4daa7db05..087403e5c 100644
--- a/langs/nan.json
+++ b/langs/nan.json
@@ -4,5 +4,11 @@
     },
     "centerMessage": {
         "allFilteredAway": "当前视图中没有满足过滤条件的要素"
+    },
+    "validation": {
+        "wikidata": {
+            "description": "A Wikidata identifier",
+            "startsWithQ": "A wikidata identifier starts with Q and is followed by a number"
+        }
     }
-}
\ No newline at end of file
+}

From ebbafef42f3a888d3f861b678f503fcce6dcfcaa Mon Sep 17 00:00:00 2001
From: kjon <kjon@gmx.de>
Date: Tue, 3 Sep 2024 18:54:00 +0000
Subject: [PATCH 4/9] Translated using Weblate (German)

Currently translated at 100.0% (3731 of 3731 strings)

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

diff --git a/langs/layers/de.json b/langs/layers/de.json
index 58f81f945..d15b97c2d 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -661,7 +661,7 @@
                         "then": "Sie können Bargeld in diesen Geldautomaten einzahlen"
                     },
                     "2": {
-                        "then": "Sie können an diesem Geldautomaten kein Bargeld einzahlen"
+                        "then": "Am Geldautomaten kann kein Bargeld eingezahlt werden"
                     }
                 },
                 "question": "Kann man an diesem Geldautomaten Bargeld einzahlen?"
@@ -669,16 +669,16 @@
             "cash_out": {
                 "mappings": {
                     "0": {
-                        "then": "Sie können an diesem Geldautomaten Bargeld abheben"
+                        "then": "Am Geldautomaten kann Bargeld abgehoben werden"
                     },
                     "1": {
-                        "then": "An diesem Geldautomaten können Sie Bargeld abheben"
+                        "then": "Am Automaten kann Bargeld abgehoben werden"
                     },
                     "2": {
-                        "then": "Sie können an diesem Geldautomaten kein Bargeld abheben"
+                        "then": "Am Automaten kann kein Bargeld abgehoben werden"
                     }
                 },
-                "question": "Kann man an diesem Geldautomaten Bargeld abheben?"
+                "question": "Kann man am Automaten Bargeld abheben?"
             },
             "cash_out-denominations-notes": {
                 "mappings": {
@@ -692,7 +692,7 @@
                         "then": "20-Euro-Scheine können abgehoben werden"
                     },
                     "3": {
-                        "then": "Es können 50-Euro-Scheine abgehoben werden"
+                        "then": "50-Euro-Scheine können abgehoben werden"
                     },
                     "4": {
                         "then": "100-Euro-Scheine können abgehoben werden"
@@ -704,7 +704,7 @@
                         "then": "500-Euro-Scheine können abgehoben werden"
                     }
                 },
-                "question": "Welche Geldscheine können Sie hier abheben?"
+                "question": "Welche Geldscheine können abgehoben werden?"
             },
             "name": {
                 "render": "Der Name des Geldautomaten ist {name}"
@@ -719,13 +719,13 @@
             "speech_output": {
                 "mappings": {
                     "0": {
-                        "then": "Dieser Geldautomat verfügt über eine Sprachausgabe, die normalerweise über eine Kopfhörerbuchse verfügbar ist"
+                        "then": "Der Geldautomat hat eine Sprachausgabe, in der Regel verfügbar über eine Kopfhörerbuchse"
                     },
                     "1": {
-                        "then": "Dieser Geldautomat hat keine Sprachausgabe"
+                        "then": "Der Geldautomat hat keine Sprachausgabe"
                     }
                 },
-                "question": "Verfügt dieser Geldautomat über eine Sprachausgabe für sehbehinderte Benutzer?"
+                "question": "Ist eine Sprachausgabe für Sehbehinderte vorhanden?"
             },
             "speech_output_language": {
                 "render": {
@@ -7466,7 +7466,7 @@
                 "question": "Ist der Spielplatz öffentlich zugänglich?"
             },
             "playground-email": {
-                "question": "Wie lautet die E-Mail Adresse des Spielplatzbetreuers?",
+                "question": "Wie lautet die E-Mail Adresse des Spielplatzbetreibers?",
                 "render": "<a href='mailto:{email}'>{email}</a>"
             },
             "playground-lit": {
@@ -7504,7 +7504,7 @@
                 "render": "Betrieben von {operator}"
             },
             "playground-phone": {
-                "question": "Wie lautet die Telefonnummer vom Betreiber des Spielplatzes?",
+                "question": "Wie lautet die Telefonnummer des Spielplatzbetreibers?",
                 "render": "<a href='tel:{phone}'>{phone}</a>"
             },
             "playground-surface": {
@@ -7559,7 +7559,7 @@
     },
     "playground_equipment": {
         "description": "Ebene mit Spielplatzausrüstung",
-        "name": "Spielplatzausstattung",
+        "name": "Spielgeräte",
         "presets": {
             "0": {
                 "description": "Ein genauer Typ wird später gefragt",
@@ -8349,7 +8349,7 @@
             },
             "qr_code": {
                 "render": {
-                    "after": "Scannen Sie den Code, um diesen Ort auf einem anderen Gerät zu öffnen"
+                    "after": "QR Code scannen, um diesen Ort auf einem anderen Gerät zu öffnen"
                 }
             },
             "repeated": {
@@ -9175,7 +9175,7 @@
             "brand": {
                 "mappings": {
                     "0": {
-                        "then": "Dieses Geschäft gehört zu keiner Marke oder Handelskette"
+                        "then": "Das Geschäft gehört zu keiner Marke oder Handelskette"
                     }
                 },
                 "question": "Zu welcher Marke gehört dieses Geschäft?",

From 5fbc20f5011af4c7ecf24b65c3e88676e25e7fcb Mon Sep 17 00:00:00 2001
From: Krzysztof Chorzempa <kasztan2@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:45:33 +0000
Subject: [PATCH 5/9] Translated using Weblate (Polish)

Currently translated at 26.9% (1007 of 3731 strings)

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

diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index 79b584b91..7829c31d7 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -32,6 +32,9 @@
                 "description": "Duża struktura reklamowa na dworze, zwykle znajdująca się w obszarach z dużym ruchem, np. w pobliżu ruchliwych dróg",
                 "title": "bilbord"
             },
+            "1": {
+                "description": "Duży obiekt reklamowy na zewnątrz, zazwyczaj znajduje się w obszarach z dużym ruchem, np. obok ruchliwych dróg na ścianie"
+            },
             "11": {
                 "description": "Kawałek wodoodpornej tkaniny z nadrukowanym przesłaniem, trwale przymocowany do ściany",
                 "title": "plandeka"
@@ -925,6 +928,11 @@
                 "question": "Czy pompka posiada wskaźnik ciśnienia lub manometr?"
             },
             "bike_repair_station-valves": {
+                "mappings": {
+                    "1": {
+                        "then": "Dunlop"
+                    }
+                },
                 "question": "Jakie zawory są obsługiwane?",
                 "render": "Ta pompka obsługuje następujące zawory: {valves}"
             },
@@ -1005,6 +1013,11 @@
             }
         },
         "title": {
+            "mappings": {
+                "0": {
+                    "then": "<i>{name}</i>"
+                }
+            },
             "render": "Pub"
         }
     },
@@ -1234,6 +1247,17 @@
             }
         }
     },
+    "climbing_area": {
+        "tagRenderings": {
+            "Rock type (crag/rock/cliff only)": {
+                "mappings": {
+                    "0": {
+                        "then": "Wapień"
+                    }
+                }
+            }
+        }
+    },
     "climbing_gym": {
         "tagRenderings": {
             "shoe_rental": {
@@ -1725,6 +1749,7 @@
         }
     },
     "entrance": {
+        "name": "Wejście",
         "tagRenderings": {
             "Entrance type": {
                 "mappings": {
@@ -2045,6 +2070,9 @@
             "mappings": {
                 "0": {
                     "then": "Restauracja <i>{name}</i>"
+                },
+                "2": {
+                    "then": "Fastfood"
                 }
             },
             "render": "Restauracja"
@@ -2059,6 +2087,9 @@
             }
         },
         "tagRenderings": {
+            "ghost_bike-inscription": {
+                "render": "<i>{inscription}</i>"
+            },
             "ghost_bike-name": {
                 "mappings": {
                     "0": {
@@ -3430,6 +3461,7 @@
         }
     },
     "recycling": {
+        "name": "Recykling",
         "tagRenderings": {
             "recycling-accepts": {
                 "mappings": {
@@ -3475,6 +3507,17 @@
             "render": "Szkoła <i>{name}</i>"
         }
     },
+    "shops": {
+        "name": "Sklep",
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "{name}"
+                }
+            },
+            "render": "Sklep"
+        }
+    },
     "surveillance_camera": {
         "tagRenderings": {
             "Camera type: fixed; panning; dome": {
@@ -3499,6 +3542,26 @@
             }
         }
     },
+    "trail": {
+        "name": "Ścieżki",
+        "title": {
+            "render": "Ścieżka"
+        }
+    },
+    "tree_node": {
+        "tagRenderings": {
+            "tree-leaf_type": {
+                "mappings": {
+                    "0": {
+                        "then": "Szerokolistne"
+                    },
+                    "1": {
+                        "then": "Iglaste"
+                    }
+                }
+            }
+        }
+    },
     "trolley_bay": {
         "tagRenderings": {
             "denominations": {
@@ -3555,6 +3618,22 @@
             }
         }
     },
+    "veterinary": {
+        "name": "weterynaryjny",
+        "title": {
+            "render": "Weterynaryjny"
+        }
+    },
+    "visitor_information_centre": {
+        "title": {
+            "mappings": {
+                "1": {
+                    "then": "{name}"
+                }
+            },
+            "render": "{name}"
+        }
+    },
     "walls_and_buildings": {
         "description": "Specjalna warstwa zabudowana zapewniająca wszystkie mury i budynki. Warstwa ta jest przydatna w ustawieniach wstępnych obiektów, które można umieścić przy ścianach (np. AED, skrzynki pocztowe, wejścia, adresy, kamery monitorujące itp.). Warstwa ta jest domyślnie niewidoczna i użytkownik nie może jej przełączać."
     },
@@ -3628,4 +3707,4 @@
             "render": "turbina wiatrowa"
         }
     }
-}
\ No newline at end of file
+}

From 512eb65d0025accff70440618c3ffec0edddaae3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Podhoreck=C3=BD?= <j.podhorecky@volny.cz>
Date: Thu, 5 Sep 2024 14:26:44 +0000
Subject: [PATCH 6/9] Translated using Weblate (Czech)

Currently translated at 75.8% (2831 of 3731 strings)

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

diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index 0f3b4fbc0..2c202f2c1 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -32,6 +32,13 @@
                 "description": "Velká venkovní reklamní konstrukce, která se obvykle nachází na místech s velkým provozem, například podél frekventovaných silnic",
                 "title": "billboard"
             },
+            "1": {
+                "description": "Velká venkovní reklamní konstrukce, která se obvykle nachází na frekventovaných místech, například podél frekventovaných silnic, umístěná na zdi",
+                "title": "billboard připevněný na stěnu"
+            },
+            "10": {
+                "title": "obrazovka namontovaná na dopravním přístřešku"
+            },
             "11": {
                 "description": "Kus nepromokavého textilu s natištěným vzkazem, trvale připevněný na stěnu",
                 "title": "plachta"
@@ -55,6 +62,9 @@
             "3": {
                 "title": "plakátovací skříň připevněná na stěnu"
             },
+            "4": {
+                "title": "plakátovací skříňka, která je součástí přístřešku veřejné dopravy"
+            },
             "5": {
                 "description": "Malý billboard pro sousedskou reklamu, zpravidla určený pro chodce",
                 "title": "billboard"
@@ -235,6 +245,24 @@
             }
         }
     },
+    "aerialway": {
+        "description": "Různé formy přepravy osob a zboží, které využívají dráty, včetně lanovek, gondol, sedačkových lanovek, vleků a lanových drah. ",
+        "name": "Letecké trasy",
+        "pointRendering": {
+            "1": {
+                "label": {
+                    "render": "{name}"
+                }
+            }
+        },
+        "tagRenderings": {
+            "duration": {
+                "question": "Jak dlouho trvá jedna jízda tímto výtahem?",
+                "questionHint": "To nezahrnuje čekací dobu.",
+                "render": "Jedna jízda trvá {duration} minut"
+            }
+        }
+    },
     "ambulancestation": {
         "description": "Stanice záchranné služby je prostor pro umístění sanitních vozidel, zdravotnického vybavení, osobních ochranných prostředků a dalšího zdravotnického materiálu.",
         "name": "Mapa stanic rychlé záchranné služby",
@@ -9627,4 +9655,4 @@
             "render": "větrná turbína"
         }
     }
-}
\ No newline at end of file
+}

From 9dba684ef008099980d242d1d821c0384ac67328 Mon Sep 17 00:00:00 2001
From: tiptoptom <ichbintom@telegmail.com>
Date: Mon, 9 Sep 2024 07:16:31 +0000
Subject: [PATCH 7/9] Translated using Weblate (German)

Currently translated at 100.0% (3731 of 3731 strings)

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

diff --git a/langs/layers/de.json b/langs/layers/de.json
index d15b97c2d..6e7bfa82a 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -2854,7 +2854,7 @@
             "Type": {
                 "mappings": {
                     "0": {
-                        "then": "Ein Kletterfelsen - ein einzelner Felsen oder eine Klippe mit einer oder wenigen Kletterrouten, die ohne Seil sicher bestiegen werden können"
+                        "then": "Ein Boulderfelsen - ein einzelner Felsen oder eine Klippe mit einer oder wenigen Boulderrouten, die ohne Seil sicher bestiegen werden können"
                     },
                     "1": {
                         "then": "Ein Kletterfelsen - ein einzelner Fels oder eine Klippe mit mindestens einigen Kletterrouten"

From cc0485643d117ebaaa536256c9482a7b30999954 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Wed, 11 Sep 2024 15:53:09 +0200
Subject: [PATCH 8/9] chore: automated housekeeping...

---
 Docs/Layers/bike_shop.md                      | 289 +++++-
 Docs/Layers/dogfoodb.md                       |  59 +-
 Docs/Layers/dogshop.md                        | 179 +---
 Docs/Layers/food.md                           |  59 +-
 Docs/Layers/food_glutenfree.md                |  59 +-
 Docs/Layers/food_lactosefree.md               |  59 +-
 Docs/Layers/friture.md                        |  59 +-
 Docs/Layers/medical_shops.md                  | 171 ----
 Docs/Layers/shops.md                          | 179 +---
 Docs/Layers/shops_glutenfree.md               | 179 +---
 Docs/Layers/shops_lactosefree.md              | 179 +---
 Docs/Layers/shops_second_hand.md              |   3 -
 .../Layers/shops_with_climbing_shoe_repair.md | 179 +---
 Docs/Layers/sport_shops.md                    | 179 +---
 Docs/TagInfo/mapcomplete_cyclofix.json        | 929 ++++++++++++++++-
 Docs/TagInfo/mapcomplete_food.json            |  20 -
 Docs/TagInfo/mapcomplete_fritures.json        |  20 -
 Docs/TagInfo/mapcomplete_glutenfree.json      |  20 -
 Docs/TagInfo/mapcomplete_lactosefree.json     |  20 -
 Docs/TagInfo/mapcomplete_onwheels.json        |  20 -
 Docs/TagInfo/mapcomplete_personal.json        | 949 +++++++++++++++++-
 Docs/TagInfo/mapcomplete_pets.json            |  20 -
 Docs/TagInfo/mapcomplete_ski.json             |  20 -
 Docs/Themes/circular_economy.md               |   3 -
 Docs/Themes/climbing.md                       | 179 +---
 Docs/Themes/fritures.md                       |  59 +-
 Docs/Themes/glutenfree.md                     | 238 +----
 Docs/Themes/healthcare.md                     | 171 ----
 Docs/Themes/lactosefree.md                    | 238 +----
 Docs/Themes/lighthouses.md                    |   1 +
 Docs/Themes/mapcomplete-changes.md            |   2 +
 Docs/Themes/memorials.md                      |   1 +
 Docs/Themes/openlovemap.md                    | 171 ----
 Docs/Themes/pets.md                           | 238 +----
 Docs/Themes/sports.md                         | 179 +---
 Docs/Themes/waste_basket.md                   |   2 +-
 Docs/URL_Parameters.md                        |   2 +-
 Docs/wikiIndex.txt                            |   6 +-
 assets/layers/advertising/advertising.json    |  13 +-
 assets/layers/aerialway/aerialway.json        |  18 +-
 assets/layers/atm/atm.json                    |  20 +-
 .../bike_repair_station.json                  |   3 +-
 assets/layers/cafe_pub/cafe_pub.json          |   3 +-
 .../layers/climbing_area/climbing_area.json   |   5 +-
 assets/layers/entrance/entrance.json          |   3 +-
 assets/layers/food/food.json                  |   3 +-
 assets/layers/ghost_bike/ghost_bike.json      |   3 +-
 assets/layers/memorial/memorial.json          |   3 +-
 assets/layers/picnic_table/picnic_table.json  |   3 +-
 assets/layers/playground/playground.json      |  13 +-
 .../playground_equipment.json                 |   2 +-
 assets/layers/questions/questions.json        |   2 +-
 assets/layers/recycling/recycling.json        |   3 +-
 assets/layers/shops/shops.json                |  11 +-
 assets/layers/trail/trail.json                |   6 +-
 assets/layers/tree_node/tree_node.json        |   6 +-
 assets/layers/veterinary/veterinary.json      |   6 +-
 .../visitor_information_centre.json           |   6 +-
 assets/themes/fireplace/fireplace.json        |   3 +-
 assets/themes/lighthouses/lighthouses.json    |   6 +-
 assets/themes/memorials/memorials.json        |   6 +-
 assets/themes/openlovemap/openlovemap.json    |  18 +-
 assets/themes/postboxes/postboxes.json        |  18 +-
 assets/themes/waste_basket/waste_basket.json  |   6 +-
 langs/cs.json                                 |   2 +-
 langs/de.json                                 |   2 +-
 langs/en.json                                 |   2 +-
 langs/es.json                                 |   2 +-
 langs/layers/cs.json                          |   2 +-
 langs/layers/de.json                          |   2 +-
 langs/layers/pl.json                          |   2 +-
 langs/layers/sl.json                          |   2 +-
 langs/nan.json                                |   2 +-
 langs/sl.json                                 |   2 +-
 langs/themes/ca.json                          |   2 +-
 langs/themes/cs.json                          |   2 +-
 langs/themes/da.json                          |   2 +-
 langs/themes/de.json                          |   2 +-
 langs/themes/en.json                          |   2 +-
 langs/themes/es.json                          |   2 +-
 langs/themes/fr.json                          |   2 +-
 langs/themes/hu.json                          |   2 +-
 langs/themes/it.json                          |   2 +-
 langs/themes/nl.json                          |   2 +-
 langs/themes/pl.json                          |   2 +-
 langs/themes/zh_Hant.json                     |   2 +-
 src/UI/BigComponents/Filterview.svelte        |   1 -
 src/UI/BigComponents/MenuDrawer.svelte        |   2 +-
 src/assets/contributors.json                  |   2 +-
 src/assets/language_in_country.json           |   1 +
 src/assets/translators.json                   |  42 +-
 91 files changed, 2549 insertions(+), 3072 deletions(-)

diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md
index f875ca8e3..14e912e0b 100644
--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
@@ -14,6 +14,7 @@ A shop specifically selling bicycles or related items
   - [images](#images)
   - [reviews](#reviews)
   - [shops-name](#shops-name)
+  - [shop_types](#shop_types)
   - [brand](#brand)
   - [second_hand](#second_hand)
   - [opening_hours](#opening_hours)
@@ -31,9 +32,18 @@ A shop specifically selling bicycles or related items
   - [bike_second_hand](#bike_second_hand)
   - [repairs_bikes](#repairs_bikes)
   - [bicycle_rental](#bicycle_rental)
+  - [bicycle-types](#bicycle-types)
+  - [rental-capacity-city_bike](#rental-capacity-city_bike)
+  - [rental-capacity-ebike](#rental-capacity-ebike)
+  - [rental-capacity-kid_bike](#rental-capacity-kid_bike)
+  - [rental-capacity-bmx](#rental-capacity-bmx)
+  - [rental-capacity-mtb](#rental-capacity-mtb)
+  - [rental-capacity-bicycle_pannier](#rental-capacity-bicycle_pannier)
+  - [rental-capacity-tandem_bicycle](#rental-capacity-tandem_bicycle)
   - [bike_pump_service](#bike_pump_service)
   - [bike_repair_tools](#bike_repair_tools)
   - [bike_wash](#bike_wash)
+  - [bike_cleaning-service_bicycle_cleaning_charge](#bike_cleaning-service_bicycle_cleaning_charge)
   - [internet](#internet)
   - [internet-fee](#internet-fee)
   - [internet-ssid](#internet-ssid)
@@ -71,6 +81,7 @@ Elements must match **any** of the following expressions:
 | attribute | type | values which are supported by this layer |
 -----|-----|----- |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/name#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/name/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/shop#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/shop/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [shop](https://wiki.openstreetmap.org/wiki/Key:shop) | [string](../SpecialInputElements.md#string) | [bicycle_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle_rental) [agrarian](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian) [alcohol](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol) [anime](https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime) [antiques](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques) [appliance](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance) [art](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart) [baby_goods](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods) [bag](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag) [bakery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery) [bathroom_furnishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing) [beauty](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty) [bed](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed) [beverages](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages) [bicycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle) [boat](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat) [bookmaker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker) [books](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks) [brewing_supplies](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies) [butcher](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher) [camera](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera) [candles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles) [cannabis](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis) [car](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar) [car_parts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts) [car_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair) [caravan](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan) [carpet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet) [catalogue](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue) [charity](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity) [cheese](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese) [chemist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist) [chocolate](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate) [clothes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes) [coffee](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee) [collector](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector) [computer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer) [confectionery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery) [convenience](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience) [copyshop](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop) [cosmetics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics) [country_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store) [craft](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft) [curtain](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain) [dairy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy) [deli](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli) [department_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store) [doityourself](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself) [doors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors) [dry_cleaning](https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning) [e-cigarette](https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette) [electrical](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical) [electronics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics) [erotic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic) [fabric](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric) [farm](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm) [fashion_accessories](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories) [fireplace](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace) [fishing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing) [flooring](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring) [florist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist) [frame](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe) [frozen_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food) [fuel](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel) [funeral_directors](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors) [furniture](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture) [games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames) [garden_centre](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre) [gas](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas) [general](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral) [gift](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift) [greengrocer](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer) [hairdresser](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser) [hairdresser_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply) [hardware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware) [health_food](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food) [hearing_aids](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids) [herbalist](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist) [hifi](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi) [honey](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney) [household_linen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen) [houseware](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware) [hunting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting) [interior_decoration](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration) [jewelry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry) [kiosk](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk) [kitchen](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen) [laundry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry) [leather](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather) [lighting](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting) [locksmith](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith) [lottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery) [mall](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall) [massage](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage) [medical_supply](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply) [military_surplus](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus) [mobile_phone](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone) [model](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel) [money_lender](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender) [motorcycle](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle) [motorcycle_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair) [music](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic) [musical_instrument](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument) [newsagent](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent) [nutrition_supplements](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements) [nuts](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts) [optician](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician) [outdoor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor) [outpost](https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost) [paint](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint) [party](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty) [pasta](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta) [pastry](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry) [pawnbroker](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker) [perfumery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery) [pet](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet) [pet_grooming](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming) [photo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto) [pottery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery) [printer_ink](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink) [psychic](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic) [pyrotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics) [radiotechnics](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics) [religion](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion) [rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental) [repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair) [rice](https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice) [scuba_diving](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving) [seafood](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood) [second_hand](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand) [sewing](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing) [shoe_repair](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair) [shoes](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes) [spices](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices) [sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports) [stationery](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery) [storage_rental](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental) [supermarket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket) [swimming_pool](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool) [tailor](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor) [tattoo](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo) [tea](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea) [telecommunication](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication) [ticket](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket) [tiles](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles) [tobacco](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco) [tool_hire](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire) [toys](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys) [trade](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade) [travel_agency](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency) [trophy](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy) [tyres](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres) [vacuum_cleaner](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner) [variety_store](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store) [video](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo) [video_games](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games) [watches](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches) [water](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater) [water_sports](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports) [weapons](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons) [wholesale](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale) [wigs](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs) [window_blind](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind) [wine](https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/brand#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/brand/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [brand](https://wiki.openstreetmap.org/wiki/Key:brand) | [string](../SpecialInputElements.md#string) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/second_hand#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/second_hand/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [second_hand](https://wiki.openstreetmap.org/wiki/Key:second_hand) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:second_hand%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/opening_hours#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/opening_hours/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) |  |
@@ -83,17 +94,26 @@ Elements must match **any** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:bicycle:second_hand#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Abicycle%3Asecond_hand/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [service:bicycle:second_hand](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:second_hand) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Dno) [only](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:second_hand%3Donly) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:bicycle:repair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Abicycle%3Arepair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [service:bicycle:repair](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:repair) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Donly_sold) [brand](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:repair%3Dbrand) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:bicycle:rental#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Abicycle%3Arental/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [service:bicycle:rental](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dno) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/rental#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/rental/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [rental](https://wiki.openstreetmap.org/wiki/Key:rental) | [string](../SpecialInputElements.md#string) | [city_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcity_bike) [ebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Debike) [bmx](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbmx) [mtb](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dmtb) [kid_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dkid_bike) [tandem](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dtandem) [racebike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dracebike) [bike_helmet](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbike_helmet) [cargo_bike](https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcargo_bike) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:city_bike#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Acity_bike/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:city_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:city_bike) | [pnat](../SpecialInputElements.md#pnat) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:ebike#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Aebike/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:ebike](https://wiki.openstreetmap.org/wiki/Key:capacity:ebike) | [pnat](../SpecialInputElements.md#pnat) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:kid_bike#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Akid_bike/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:kid_bike](https://wiki.openstreetmap.org/wiki/Key:capacity:kid_bike) | [pnat](../SpecialInputElements.md#pnat) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:bmx#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Abmx/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:bmx](https://wiki.openstreetmap.org/wiki/Key:capacity:bmx) | [pnat](../SpecialInputElements.md#pnat) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:mtb#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Amtb/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:mtb](https://wiki.openstreetmap.org/wiki/Key:capacity:mtb) | [pnat](../SpecialInputElements.md#pnat) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:bicycle_pannier#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Abicycle_pannier/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:bicycle_pannier](https://wiki.openstreetmap.org/wiki/Key:capacity:bicycle_pannier) | [pnat](../SpecialInputElements.md#pnat) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/capacity:tandem_bicycle#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/capacity%3Atandem_bicycle/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [capacity:tandem_bicycle](https://wiki.openstreetmap.org/wiki/Key:capacity:tandem_bicycle) | [pnat](../SpecialInputElements.md#pnat) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:bicycle:pump#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Abicycle%3Apump/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [service:bicycle:pump](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:pump) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dno) [separate](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:pump%3Dseparate) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:bicycle:diy#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Abicycle%3Adiy/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [service:bicycle:diy](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:diy) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Dno) [only_sold](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:diy%3Donly_sold) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:bicycle:cleaning#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Abicycle%3Acleaning/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [service:bicycle:cleaning](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dyes) [diy](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Ddiy) [no](https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/internet_access#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/internet_access/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/service:bicycle:cleaning:charge#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/service%3Abicycle%3Acleaning%3Acharge/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [service:bicycle:cleaning:charge](https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:charge) | [string](../SpecialInputElements.md#string) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/internet_access#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/internet_access/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [internet_access](https://wiki.openstreetmap.org/wiki/Key:internet_access) | Multiple choice | [wlan](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dno) [terminal](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal) [wired](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired) [terminal;wifi](https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal;wifi) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/internet_access:fee#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/internet_access%3Afee/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [internet_access:fee](https://wiki.openstreetmap.org/wiki/Key:internet_access:fee) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dno) [customers](https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/internet_access:ssid#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/internet_access%3Assid/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [internet_access:ssid](https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid) | [string](../SpecialInputElements.md#string) | [Telekom](https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom) |
 | <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 | [yes](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dyes) [only](https://wiki.openstreetmap.org/wiki/Tag:organic%3Donly) [no](https://wiki.openstreetmap.org/wiki/Tag:organic%3Dno) |
 | <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: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/description#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/description/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [description](https://wiki.openstreetmap.org/wiki/Key:description) | [string](../SpecialInputElements.md#string) |  |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/description#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/description/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [description](https://wiki.openstreetmap.org/wiki/Key:description) | [text](../SpecialInputElements.md#text) |  |
 
 ### images
 This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata` and shows the button to upload new images
@@ -110,6 +130,176 @@ _This tagrendering has no question and is thus read-only_
 The question is `What is the name of this shop?`
 *This shop is called <i>{name}</i>* is shown if `name` is set
 
+### shop_types
+
+The question is `What kind of shop is this?`
+*This is a {shop}* is shown if `shop` is set
+
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/bicycle_rental.svg' style='width: 3rem; height: 3rem'> *Bicycle rental shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle_rental' target='_blank'>bicycle_rental</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-tractor.svg' style='width: 3rem; height: 3rem'> *Farm Supply Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dagrarian' target='_blank'>agrarian</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-wine-bottle.svg' style='width: 3rem; height: 3rem'> *Liquor Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dalcohol' target='_blank'>alcohol</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-dragon.svg' style='width: 3rem; height: 3rem'> *Anime / Manga Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Danime' target='_blank'>anime</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-furniture.svg' style='width: 3rem; height: 3rem'> *Antique Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dantiques' target='_blank'>antiques</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-laundry.svg' style='width: 3rem; height: 3rem'> *Appliance Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dappliance' target='_blank'>appliance</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Art Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dart' target='_blank'>art</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-baby-carriage.svg' style='width: 3rem; height: 3rem'> *Baby Goods Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbaby_goods' target='_blank'>baby_goods</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-suitcase-rolling.svg' style='width: 3rem; height: 3rem'> *Bag/Luggage Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbag' target='_blank'>bag</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-bakery.svg' style='width: 3rem; height: 3rem'> *Bakery* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbakery' target='_blank'>bakery</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-bath.svg' style='width: 3rem; height: 3rem'> *Bathroom Furnishing Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbathroom_furnishing' target='_blank'>bathroom_furnishing</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-lipstick.svg' style='width: 3rem; height: 3rem'> *Beauty Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeauty' target='_blank'>beauty</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-lodging.svg' style='width: 3rem; height: 3rem'> *Bedding/Mattress Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbed' target='_blank'>bed</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-bottles.svg' style='width: 3rem; height: 3rem'> *Beverage Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbeverages' target='_blank'>beverages</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-bicycle.svg' style='width: 3rem; height: 3rem'> *Bicycle Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle' target='_blank'>bicycle</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-boat.svg' style='width: 3rem; height: 3rem'> *Boat Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dboat' target='_blank'>boat</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-money_hand.svg' style='width: 3rem; height: 3rem'> *Bookmaker* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbookmaker' target='_blank'>bookmaker</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-book.svg' style='width: 3rem; height: 3rem'> *Bookstore* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbooks' target='_blank'>books</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-storage_fermenter.svg' style='width: 3rem; height: 3rem'> *Brewing Supply Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbrewing_supplies' target='_blank'>brewing_supplies</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-cleaver.svg' style='width: 3rem; height: 3rem'> *Butcher* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbutcher' target='_blank'>butcher</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-camera-retro.svg' style='width: 3rem; height: 3rem'> *Camera Equipment Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcamera' target='_blank'>camera</a>
+ -  *Candle Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcandles' target='_blank'>candles</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-cannabis.svg' style='width: 3rem; height: 3rem'> *Cannabis Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcannabis' target='_blank'>cannabis</a>
+ -  *Car Dealership* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar' target='_blank'>car</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-car-battery.svg' style='width: 3rem; height: 3rem'> *Car Parts Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_parts' target='_blank'>car_parts</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-car-repair.svg' style='width: 3rem; height: 3rem'> *Car Repair Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcar_repair' target='_blank'>car_repair</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-camper_trailer.svg' style='width: 3rem; height: 3rem'> *RV Dealership* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcaravan' target='_blank'>caravan</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-tape.svg' style='width: 3rem; height: 3rem'> *Carpet Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcarpet' target='_blank'>carpet</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Catalog Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcatalogue' target='_blank'>catalogue</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Charity Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcharity' target='_blank'>charity</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-cheese.svg' style='width: 3rem; height: 3rem'> *Cheese Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcheese' target='_blank'>cheese</a>
+ -  *Drugstore* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchemist' target='_blank'>chemist</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-confectionery.svg' style='width: 3rem; height: 3rem'> *Chocolate Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dchocolate' target='_blank'>chocolate</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-clothing-store.svg' style='width: 3rem; height: 3rem'> *Clothing Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dclothes' target='_blank'>clothes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-coffee.svg' style='width: 3rem; height: 3rem'> *Coffee Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcoffee' target='_blank'>coffee</a>
+ -  *Collectibles Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcollector' target='_blank'>collector</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-laptop.svg' style='width: 3rem; height: 3rem'> *Computer Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcomputer' target='_blank'>computer</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-confectionery.svg' style='width: 3rem; height: 3rem'> *Candy Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery' target='_blank'>confectionery</a>
+ -  *Convenience Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience' target='_blank'>convenience</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-print.svg' style='width: 3rem; height: 3rem'> *Copy Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop' target='_blank'>copyshop</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-lipstick.svg' style='width: 3rem; height: 3rem'> *Cosmetics Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcosmetics' target='_blank'>cosmetics</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-hat-cowboy-side.svg' style='width: 3rem; height: 3rem'> *Rural Supplies Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcountry_store' target='_blank'>country_store</a>
+ -  *Arts & Crafts Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcraft' target='_blank'>craft</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-curtains.svg' style='width: 3rem; height: 3rem'> *Curtain Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain' target='_blank'>curtain</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-cheese.svg' style='width: 3rem; height: 3rem'> *Dairy Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddairy' target='_blank'>dairy</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-jar.svg' style='width: 3rem; height: 3rem'> *Delicatessen* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli' target='_blank'>deli</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Department Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store' target='_blank'>department_store</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tools.svg' style='width: 3rem; height: 3rem'> *DIY Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoityourself' target='_blank'>doityourself</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-door-open.svg' style='width: 3rem; height: 3rem'> *Door Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddoors' target='_blank'>doors</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-clothes_hanger.svg' style='width: 3rem; height: 3rem'> *Dry Cleaner* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Ddry_cleaning' target='_blank'>dry_cleaning</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *E-Cigarette Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3De-cigarette' target='_blank'>e-cigarette</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-power.svg' style='width: 3rem; height: 3rem'> *Electrical Equipment Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectrical' target='_blank'>electrical</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-plug.svg' style='width: 3rem; height: 3rem'> *Electronics Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Delectronics' target='_blank'>electronics</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Erotic Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic' target='_blank'>erotic</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-tape.svg' style='width: 3rem; height: 3rem'> *Fabric Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric' target='_blank'>fabric</a>
+ -  *Produce Stand* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfarm' target='_blank'>farm</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-fashion_accessories.svg' style='width: 3rem; height: 3rem'> *Fashion Accessories Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfashion_accessories' target='_blank'>fashion_accessories</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-fireplace.svg' style='width: 3rem; height: 3rem'> *Fireplace Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfireplace' target='_blank'>fireplace</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-ice_fishing.svg' style='width: 3rem; height: 3rem'> *Fishing Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfishing' target='_blank'>fishing</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tools.svg' style='width: 3rem; height: 3rem'> *Flooring Supply Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflooring' target='_blank'>flooring</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-florist.svg' style='width: 3rem; height: 3rem'> *Florist* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dflorist' target='_blank'>florist</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-vector-square.svg' style='width: 3rem; height: 3rem'> *Framing Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe' target='_blank'>frame</a>
+ -  *Frozen Food Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfrozen_food' target='_blank'>frozen_food</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-propane_tank.svg' style='width: 3rem; height: 3rem'> *Fuel Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuel' target='_blank'>fuel</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-cemetery.svg' style='width: 3rem; height: 3rem'> *Funeral Home* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfuneral_directors' target='_blank'>funeral_directors</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-couch.svg' style='width: 3rem; height: 3rem'> *Furniture Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dfurniture' target='_blank'>furniture</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-dice.svg' style='width: 3rem; height: 3rem'> *Tabletop Game Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgames' target='_blank'>games</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-garden-centre.svg' style='width: 3rem; height: 3rem'> *Garden Center* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgarden_centre' target='_blank'>garden_centre</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-propane_tank.svg' style='width: 3rem; height: 3rem'> *Bottled Gas Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgas' target='_blank'>gas</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *General Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgeneral' target='_blank'>general</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-gift.svg' style='width: 3rem; height: 3rem'> *Gift Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgift' target='_blank'>gift</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-carrot.svg' style='width: 3rem; height: 3rem'> *Greengrocer* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer' target='_blank'>greengrocer</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-beauty_salon.svg' style='width: 3rem; height: 3rem'> *Hairdresser* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser' target='_blank'>hairdresser</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-hair_care.svg' style='width: 3rem; height: 3rem'> *Hairdresser Supply Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhairdresser_supply' target='_blank'>hairdresser_supply</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tools.svg' style='width: 3rem; height: 3rem'> *Hardware Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhardware' target='_blank'>hardware</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Health Food Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhealth_food' target='_blank'>health_food</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-hearing_aid.svg' style='width: 3rem; height: 3rem'> *Hearing Aids Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids' target='_blank'>hearing_aids</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-leaf.svg' style='width: 3rem; height: 3rem'> *Herbalist* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dherbalist' target='_blank'>herbalist</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-speaker.svg' style='width: 3rem; height: 3rem'> *Hifi Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhifi' target='_blank'>hifi</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Honey Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhoney' target='_blank'>honey</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-cloth.svg' style='width: 3rem; height: 3rem'> *Household Linen Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhousehold_linen' target='_blank'>household_linen</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-blender.svg' style='width: 3rem; height: 3rem'> *Houseware Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhouseware' target='_blank'>houseware</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-bow_and_arrow.svg' style='width: 3rem; height: 3rem'> *Hunting Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dhunting' target='_blank'>hunting</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Interior Decoration Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dinterior_decoration' target='_blank'>interior_decoration</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-jewelry-store.svg' style='width: 3rem; height: 3rem'> *Jewelry Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry' target='_blank'>jewelry</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-store.svg' style='width: 3rem; height: 3rem'> *Kiosk* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkiosk' target='_blank'>kiosk</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-kitchen_sink.svg' style='width: 3rem; height: 3rem'> *Kitchen Design Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen' target='_blank'>kitchen</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-laundry.svg' style='width: 3rem; height: 3rem'> *Laundry* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlaundry' target='_blank'>laundry</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-handbag.svg' style='width: 3rem; height: 3rem'> *Leather Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dleather' target='_blank'>leather</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-desk_lamp.svg' style='width: 3rem; height: 3rem'> *Lighting Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlighting' target='_blank'>lighting</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-key.svg' style='width: 3rem; height: 3rem'> *Locksmith* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlocksmith' target='_blank'>locksmith</a>
+ -  *Lottery Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dlottery' target='_blank'>lottery</a>
+ -  *Mall* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall' target='_blank'>mall</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-spa.svg' style='width: 3rem; height: 3rem'> *Massage Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmassage' target='_blank'>massage</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-crutch.svg' style='width: 3rem; height: 3rem'> *Medical Supply Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmedical_supply' target='_blank'>medical_supply</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-military.svg' style='width: 3rem; height: 3rem'> *Military Surplus Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmilitary_surplus' target='_blank'>military_surplus</a>
+ -  *Mobile Phone Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone' target='_blank'>mobile_phone</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Model Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmodel' target='_blank'>model</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-money_hand.svg' style='width: 3rem; height: 3rem'> *Money Lender* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmoney_lender' target='_blank'>money_lender</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-motorcycle.svg' style='width: 3rem; height: 3rem'> *Motorcycle Dealership* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle' target='_blank'>motorcycle</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-motorcycle_repair.svg' style='width: 3rem; height: 3rem'> *Motorcycle Repair Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmotorcycle_repair' target='_blank'>motorcycle_repair</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-compact-disc.svg' style='width: 3rem; height: 3rem'> *Music Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusic' target='_blank'>music</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-guitar.svg' style='width: 3rem; height: 3rem'> *Musical Instrument Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument' target='_blank'>musical_instrument</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-newspaper.svg' style='width: 3rem; height: 3rem'> *Newsstand* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnewsagent' target='_blank'>newsagent</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-pills.svg' style='width: 3rem; height: 3rem'> *Nutrition Supplements Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnutrition_supplements' target='_blank'>nutrition_supplements</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Nuts Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dnuts' target='_blank'>nuts</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-optician.svg' style='width: 3rem; height: 3rem'> *Optician* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doptician' target='_blank'>optician</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-compass.svg' style='width: 3rem; height: 3rem'> *Outdoors Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor' target='_blank'>outdoor</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Online Retailer Outpost* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutpost' target='_blank'>outpost</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-paint-roller.svg' style='width: 3rem; height: 3rem'> *Paint Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint' target='_blank'>paint</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-balloon.svg' style='width: 3rem; height: 3rem'> *Party Supply Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dparty' target='_blank'>party</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-plate-wheat.svg' style='width: 3rem; height: 3rem'> *Pasta Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpasta' target='_blank'>pasta</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-bakery.svg' style='width: 3rem; height: 3rem'> *Pastry Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpastry' target='_blank'>pastry</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-money_hand.svg' style='width: 3rem; height: 3rem'> *Pawnshop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpawnbroker' target='_blank'>pawnbroker</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-perfume.svg' style='width: 3rem; height: 3rem'> *Perfume Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dperfumery' target='_blank'>perfumery</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-cat.svg' style='width: 3rem; height: 3rem'> *Pet Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet' target='_blank'>pet</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-pet_grooming.svg' style='width: 3rem; height: 3rem'> *Pet Groomer* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet_grooming' target='_blank'>pet_grooming</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-camera-retro.svg' style='width: 3rem; height: 3rem'> *Photography Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dphoto' target='_blank'>photo</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-vase.svg' style='width: 3rem; height: 3rem'> *Pottery Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpottery' target='_blank'>pottery</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-print.svg' style='width: 3rem; height: 3rem'> *Printer Ink Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dprinter_ink' target='_blank'>printer_ink</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-psychic.svg' style='width: 3rem; height: 3rem'> *Psychic* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpsychic' target='_blank'>psychic</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-rocket_firework.svg' style='width: 3rem; height: 3rem'> *Fireworks Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpyrotechnics' target='_blank'>pyrotechnics</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-microchip.svg' style='width: 3rem; height: 3rem'> *Radio/Electronic Component Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dradiotechnics' target='_blank'>radiotechnics</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Religious Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dreligion' target='_blank'>religion</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-dolly.svg' style='width: 3rem; height: 3rem'> *Rental Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental' target='_blank'>rental</a>
+ -  *Repair Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drepair' target='_blank'>repair</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-bowl-rice.svg' style='width: 3rem; height: 3rem'> *Rice Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drice' target='_blank'>rice</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-scuba_diving.svg' style='width: 3rem; height: 3rem'> *Scuba Diving Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dscuba_diving' target='_blank'>scuba_diving</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-fish_cleaning.svg' style='width: 3rem; height: 3rem'> *Seafood Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood' target='_blank'>seafood</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Thrift Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsecond_hand' target='_blank'>second_hand</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-needle_and_spool.svg' style='width: 3rem; height: 3rem'> *Sewing Supply Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsewing' target='_blank'>sewing</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-hammer_shoe.svg' style='width: 3rem; height: 3rem'> *Shoe Repair Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoe_repair' target='_blank'>shoe_repair</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shoe.svg' style='width: 3rem; height: 3rem'> *Shoe Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dshoes' target='_blank'>shoes</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-spice_bottle.svg' style='width: 3rem; height: 3rem'> *Spice Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dspices' target='_blank'>spices</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-futbol.svg' style='width: 3rem; height: 3rem'> *Sporting Goods Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsports' target='_blank'>sports</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-paperclip.svg' style='width: 3rem; height: 3rem'> *Stationery Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstationery' target='_blank'>stationery</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-storage_rental.svg' style='width: 3rem; height: 3rem'> *Storage Rental* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dstorage_rental' target='_blank'>storage_rental</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-grocery.svg' style='width: 3rem; height: 3rem'> *Supermarket* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket' target='_blank'>supermarket</a>
+ -  *Pool Supply Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dswimming_pool' target='_blank'>swimming_pool</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-needle_and_spool.svg' style='width: 3rem; height: 3rem'> *Tailor* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtailor' target='_blank'>tailor</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tattoo_machine.svg' style='width: 3rem; height: 3rem'> *Tattoo Parlor* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtattoo' target='_blank'>tattoo</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-teahouse.svg' style='width: 3rem; height: 3rem'> *Tea Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtea' target='_blank'>tea</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-telephone.svg' style='width: 3rem; height: 3rem'> *Telecom Retail Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtelecommunication' target='_blank'>telecommunication</a>
+ -  *Ticket Seller* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dticket' target='_blank'>ticket</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tiling.svg' style='width: 3rem; height: 3rem'> *Tile Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtiles' target='_blank'>tiles</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-pipe.svg' style='width: 3rem; height: 3rem'> *Tobacco Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtobacco' target='_blank'>tobacco</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tools.svg' style='width: 3rem; height: 3rem'> *Tool Rental* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtool_hire' target='_blank'>tool_hire</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-rocket.svg' style='width: 3rem; height: 3rem'> *Toy Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtoys' target='_blank'>toys</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tools.svg' style='width: 3rem; height: 3rem'> *Trade Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrade' target='_blank'>trade</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-suitcase.svg' style='width: 3rem; height: 3rem'> *Travel Agency* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtravel_agency' target='_blank'>travel_agency</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/fas-trophy.svg' style='width: 3rem; height: 3rem'> *Trophy Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtrophy' target='_blank'>trophy</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-tire.svg' style='width: 3rem; height: 3rem'> *Tire Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dtyres' target='_blank'>tyres</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-vacuum.svg' style='width: 3rem; height: 3rem'> *Vacuum Cleaner Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner' target='_blank'>vacuum_cleaner</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Discount Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store' target='_blank'>variety_store</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-movie_rental.svg' style='width: 3rem; height: 3rem'> *Video Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo' target='_blank'>video</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-gaming.svg' style='width: 3rem; height: 3rem'> *Video Game Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dvideo_games' target='_blank'>video_games</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-watch.svg' style='width: 3rem; height: 3rem'> *Watches Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwatches' target='_blank'>watches</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-water_bottle.svg' style='width: 3rem; height: 3rem'> *Drinking Water Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater' target='_blank'>water</a>
+ -  *Watersport/Swim Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwater_sports' target='_blank'>water_sports</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-dagger.svg' style='width: 3rem; height: 3rem'> *Weapon Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dweapons' target='_blank'>weapons</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-warehouse.svg' style='width: 3rem; height: 3rem'> *Wholesale Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwholesale' target='_blank'>wholesale</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-shop.svg' style='width: 3rem; height: 3rem'> *Wig Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwigs' target='_blank'>wigs</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
+
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -266,6 +456,88 @@ The question is `Does this shop rent out bikes?`
 
 This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle' target='_blank'>bicycle</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dsport' target='_blank'>sport</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle_repair' target='_blank'>bicycle_repair</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Doutdoor' target='_blank'>outdoor</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental' target='_blank'>rental</a> | service:bicycle:rental~.+
 
+### bicycle-types
+
+The question is `What kind of bicycles and accessories are rented here?`
+*{rental} is rented here* is shown if `rental` is set
+
+ -  *Normal city bikes can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcity_bike' target='_blank'>city_bike</a>
+ -  *Electrical bikes can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Debike' target='_blank'>ebike</a>
+ -  *BMX bikes can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbmx' target='_blank'>bmx</a>
+ -  *Mountainbikes can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dmtb' target='_blank'>mtb</a>
+ -  *Bikes for children can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dkid_bike' target='_blank'>kid_bike</a>
+ -  *Tandem bicycles can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dtandem' target='_blank'>tandem</a>
+ -  *Race bicycles can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dracebike' target='_blank'>racebike</a>
+ -  *Bike helmets can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dbike_helmet' target='_blank'>bike_helmet</a>
+ -  *Cargo bikes can be rented here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:rental' target='_blank'>rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:rental%3Dcargo_bike' target='_blank'>cargo_bike</a>
+
+This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+
+This tagrendering has labels 
+`bicycle_rental`
+
+### rental-capacity-city_bike
+
+The question is `How many city bikes can be rented here?`
+*{capacity:city_bike} city bikes can be rented here* is shown if `capacity:city_bike` is set
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+) & rental~^(.*city_bike.*)$
+This tagrendering has labels 
+`bicycle_rental`
+
+### rental-capacity-ebike
+
+The question is `How many electrical bikes can be rented here?`
+*{capacity:ebike} electrical bikes can be rented here* is shown if `capacity:ebike` is set
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+) & rental~^(.*ebike.*)$
+This tagrendering has labels 
+`bicycle_rental`
+
+### rental-capacity-kid_bike
+
+The question is `How many bikes for children can be rented here?`
+*{capacity:kid_bike} bikes for children can be rented here* is shown if `capacity:kid_bike` is set
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+) & rental~^(.*kid_bike.*)$
+This tagrendering has labels 
+`bicycle_rental`
+
+### rental-capacity-bmx
+
+The question is `How many BMX bikes can be rented here?`
+*{capacity:bmx} BMX bikes can be rented here* is shown if `capacity:bmx` is set
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+) & rental~^(.*bmx.*)$
+This tagrendering has labels 
+`bicycle_rental`
+
+### rental-capacity-mtb
+
+The question is `How many mountainbikes can be rented here?`
+*{capacity:mtb} mountainbikes can be rented here* is shown if `capacity:mtb` is set
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+) & rental~^(.*mtb.*)$
+This tagrendering has labels 
+`bicycle_rental`
+
+### rental-capacity-bicycle_pannier
+
+The question is `How many bicycle panniers can be rented here?`
+*{capacity:bicycle_pannier} bicycle panniers can be rented here* is shown if `capacity:bicycle_pannier` is set
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+) & rental~^(.*bicycle_pannier.*)$
+This tagrendering has labels 
+`bicycle_rental`
+
+### rental-capacity-tandem_bicycle
+
+The question is `How many tandem can be rented here?`
+*{capacity:tandem_bicycle} tandem can be rented here* is shown if `capacity:tandem_bicycle` is set
+
+This tagrendering is only visible in the popup if the following condition is met: (<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a> | bicycle_rental~.+) & rental~^(.*tandem_bicycle.*)$
+This tagrendering has labels 
+`bicycle_rental`
+
 ### bike_pump_service
 
 The question is `Does this shop offer a bike pump for use by anyone?`
@@ -296,6 +568,16 @@ The question is `Are bicycles washed here?`
 
 This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle' target='_blank'>bicycle</a> | <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dbicycle_repair' target='_blank'>bicycle_repair</a> | ^(service:bicycle:.*)$~~^(yes|only)$ | service:bicycle:cleaning~.+
 
+### bike_cleaning-service_bicycle_cleaning_charge
+
+The question is `How much does it cost to use the cleaning service?`
+*Using the cleaning service costs {service:bicycle:cleaning:charge}* is shown if `service:bicycle:cleaning:charge` is set
+
+ -  *The cleaning service is free to use* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dno' target='_blank'>no</a>
+ -  *Free to use* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dyes' target='_blank'>yes</a> & service:bicycle:cleaning:charge=. _This option cannot be chosen as answer_
+
+This tagrendering is only visible in the popup if the following condition is met: amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+
+
 ### internet
 
 The question is `Does this place offer internet access?`
@@ -305,6 +587,7 @@ The question is `Does this place offer internet access?`
  -  *This place offers internet access* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dyes' target='_blank'>yes</a>. _This option cannot be chosen as answer_
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers internet access via a terminal or computer* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal' target='_blank'>terminal</a>
  -  *This place offers wired internet access* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwired' target='_blank'>wired</a>
+ - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/computer' style='width: 3rem; height: 3rem'> *This place offers both wireless internet and internet access via a terminal or computer* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dterminal;wifi' target='_blank'>terminal;wifi</a>
 
 This tagrendering has labels 
 `internet-all`
@@ -328,7 +611,7 @@ The question is `What is the network name for the wireless internet access?`
 
  -  *Telekom* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:ssid' target='_blank'>internet_access:ssid</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:ssid%3DTelekom' target='_blank'>Telekom</a>
 
-This tagrendering is only visible in the popup if the following condition is met: <a href='https://wiki.openstreetmap.org/wiki/Key:internet_access' target='_blank'>internet_access</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access%3Dwlan' target='_blank'>wlan</a>
+This tagrendering is only visible in the popup if the following condition is met: internet_access~^(.*wlan.*)$
 This tagrendering has labels 
 `internet-all`
 
diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md
index 1f7fb2578..82cd4ad68 100644
--- a/Docs/Layers/dogfoodb.md
+++ b/Docs/Layers/dogfoodb.md
@@ -84,7 +84,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -213,25 +213,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -538,29 +534,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md
index 90a40f9aa..8ff5a4f3c 100644
--- a/Docs/Layers/dogshop.md
+++ b/Docs/Layers/dogshop.md
@@ -299,9 +299,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -699,6 +696,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -707,174 +712,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md
index ec1e3c95e..60fcbd745 100644
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@@ -90,7 +90,7 @@ Elements must match **any** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -219,25 +219,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -544,29 +540,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Layers/food_glutenfree.md b/Docs/Layers/food_glutenfree.md
index feb5dd6b2..e1b3846ed 100644
--- a/Docs/Layers/food_glutenfree.md
+++ b/Docs/Layers/food_glutenfree.md
@@ -86,7 +86,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -226,25 +226,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -539,29 +535,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Layers/food_lactosefree.md b/Docs/Layers/food_lactosefree.md
index ca568d4ef..794d62189 100644
--- a/Docs/Layers/food_lactosefree.md
+++ b/Docs/Layers/food_lactosefree.md
@@ -86,7 +86,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -226,25 +226,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -539,29 +535,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md
index dcad9f508..19804cb00 100644
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@@ -84,7 +84,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -213,25 +213,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -538,29 +534,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Layers/medical_shops.md b/Docs/Layers/medical_shops.md
index f20fde283..4a135d361 100644
--- a/Docs/Layers/medical_shops.md
+++ b/Docs/Layers/medical_shops.md
@@ -299,9 +299,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -707,174 +704,6 @@ This tagrendering has labels
 -----|-----|----- |
 | accepts_cards.0 | Accepts payment cards | payment:cards=yes |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md
index 0cd062ad4..3ca28db3e 100644
--- a/Docs/Layers/shops.md
+++ b/Docs/Layers/shops.md
@@ -309,9 +309,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -709,6 +706,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -717,174 +722,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Layers/shops_glutenfree.md b/Docs/Layers/shops_glutenfree.md
index 3a866b710..c4de0b7aa 100644
--- a/Docs/Layers/shops_glutenfree.md
+++ b/Docs/Layers/shops_glutenfree.md
@@ -313,9 +313,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -700,6 +697,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -708,174 +713,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Layers/shops_lactosefree.md b/Docs/Layers/shops_lactosefree.md
index 876b9df4b..b9ef5eec3 100644
--- a/Docs/Layers/shops_lactosefree.md
+++ b/Docs/Layers/shops_lactosefree.md
@@ -313,9 +313,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -700,6 +697,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -708,174 +713,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Layers/shops_second_hand.md b/Docs/Layers/shops_second_hand.md
index fd15efafb..e6cf7d9e7 100644
--- a/Docs/Layers/shops_second_hand.md
+++ b/Docs/Layers/shops_second_hand.md
@@ -298,9 +298,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
diff --git a/Docs/Layers/shops_with_climbing_shoe_repair.md b/Docs/Layers/shops_with_climbing_shoe_repair.md
index 03db97da8..f67052b74 100644
--- a/Docs/Layers/shops_with_climbing_shoe_repair.md
+++ b/Docs/Layers/shops_with_climbing_shoe_repair.md
@@ -308,9 +308,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -708,6 +705,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -716,174 +721,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Layers/sport_shops.md b/Docs/Layers/sport_shops.md
index 9e6f0c7e1..689b757c5 100644
--- a/Docs/Layers/sport_shops.md
+++ b/Docs/Layers/sport_shops.md
@@ -296,9 +296,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -696,6 +693,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -704,174 +709,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json
index e3e1453f7..d0896748b 100644
--- a/Docs/TagInfo/mapcomplete_cyclofix.json
+++ b/Docs/TagInfo/mapcomplete_cyclofix.json
@@ -323,6 +323,830 @@
       "key": "name",
       "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "bicycle_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if craft=)",
+      "value": "wine"
+    },
     {
       "key": "brand",
       "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'brand' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
@@ -538,6 +1362,83 @@
       "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
       "value": "no"
     },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "city_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "ebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "bmx"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "mtb"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "kid_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "tandem"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "racebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "bike_helmet"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "cargo_bike"
+    },
+    {
+      "key": "capacity:city_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:ebike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:kid_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:bmx",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:mtb",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:bicycle_pannier",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:tandem_bicycle",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
     {
       "key": "service:bicycle:pump",
       "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
@@ -583,6 +1484,25 @@
       "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
       "value": "no"
     },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
+      "value": "no"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
+      "value": "yes"
+    },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
+      "value": ""
+    },
     {
       "key": "internet_access",
       "description": "Layer 'Bike repair/shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')",
@@ -608,6 +1528,11 @@
       "description": "Layer 'Bike repair/shop' shows internet_access=wired with a fixed text, namely 'This place offers wired internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')",
       "value": "wired"
     },
+    {
+      "key": "internet_access",
+      "description": "Layer 'Bike repair/shop' shows internet_access=terminal;wifi with a fixed text, namely 'This place offers both wireless internet and internet access via a terminal or computer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')",
+      "value": "terminal;wifi"
+    },
     {
       "key": "internet_access:fee",
       "description": "Layer 'Bike repair/shop' shows internet_access:fee=yes with a fixed text, namely 'There is a fee for the internet access at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access!=no & internet_access~.+)",
@@ -625,11 +1550,11 @@
     },
     {
       "key": "internet_access:ssid",
-      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access=wlan)"
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access~^(.*wlan.*)$)"
     },
     {
       "key": "internet_access:ssid",
-      "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access=wlan)",
+      "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Cyclofix - a map for cyclists') (This is only shown if internet_access~^(.*wlan.*)$)",
       "value": "Telekom"
     },
     {
diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json
index 620629294..9c1cf1a36 100644
--- a/Docs/TagInfo/mapcomplete_food.json
+++ b/Docs/TagInfo/mapcomplete_food.json
@@ -234,26 +234,6 @@
       "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Restaurants and fast food')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json
index b79a66dd6..78bad7e97 100644
--- a/Docs/TagInfo/mapcomplete_fritures.json
+++ b/Docs/TagInfo/mapcomplete_fritures.json
@@ -238,26 +238,6 @@
       "description": "Layer 'Fries shop' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Fries shop' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Fries shop' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Fries shop' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Fries shop' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Fries shops')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Fries shop shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/TagInfo/mapcomplete_glutenfree.json b/Docs/TagInfo/mapcomplete_glutenfree.json
index ce8f6b882..3809ede7e 100644
--- a/Docs/TagInfo/mapcomplete_glutenfree.json
+++ b/Docs/TagInfo/mapcomplete_glutenfree.json
@@ -258,26 +258,6 @@
       "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Glutenfree')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/TagInfo/mapcomplete_lactosefree.json b/Docs/TagInfo/mapcomplete_lactosefree.json
index c375e4dfd..30e13eb01 100644
--- a/Docs/TagInfo/mapcomplete_lactosefree.json
+++ b/Docs/TagInfo/mapcomplete_lactosefree.json
@@ -258,26 +258,6 @@
       "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Lactose free shops and restaurants')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json
index aecaee033..dec4b439e 100644
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@@ -758,26 +758,6 @@
       "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json
index 8a92c4857..25e7b9363 100644
--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
@@ -2796,6 +2796,830 @@
       "key": "name",
       "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'name' (in the mapcomplete.org theme 'Personal theme')"
     },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'shop' (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bicycle_rental with a fixed text, namely 'Bicycle rental shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "bicycle_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=agrarian with a fixed text, namely 'Farm Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "agrarian"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=alcohol with a fixed text, namely 'Liquor Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "alcohol"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=anime with a fixed text, namely 'Anime / Manga Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "anime"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=antiques with a fixed text, namely 'Antique Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "antiques"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=appliance with a fixed text, namely 'Appliance Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "appliance"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=art with a fixed text, namely 'Art Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "art"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=baby_goods with a fixed text, namely 'Baby Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "baby_goods"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bag with a fixed text, namely 'Bag/Luggage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "bag"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bakery with a fixed text, namely 'Bakery' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "bakery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bathroom_furnishing with a fixed text, namely 'Bathroom Furnishing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "bathroom_furnishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=beauty with a fixed text, namely 'Beauty Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "beauty"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bed with a fixed text, namely 'Bedding/Mattress Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "bed"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=beverages with a fixed text, namely 'Beverage Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "beverages"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bicycle with a fixed text, namely 'Bicycle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "bicycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=boat with a fixed text, namely 'Boat Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "boat"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=bookmaker with a fixed text, namely 'Bookmaker' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "bookmaker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=books with a fixed text, namely 'Bookstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "books"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=brewing_supplies with a fixed text, namely 'Brewing Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "brewing_supplies"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=butcher with a fixed text, namely 'Butcher' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "butcher"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=camera with a fixed text, namely 'Camera Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "camera"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=candles with a fixed text, namely 'Candle Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "candles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=cannabis with a fixed text, namely 'Cannabis Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "cannabis"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=car with a fixed text, namely 'Car Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "car"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=car_parts with a fixed text, namely 'Car Parts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "car_parts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=car_repair with a fixed text, namely 'Car Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "car_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=caravan with a fixed text, namely 'RV Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "caravan"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=carpet with a fixed text, namely 'Carpet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "carpet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=catalogue with a fixed text, namely 'Catalog Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "catalogue"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=charity with a fixed text, namely 'Charity Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "charity"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=cheese with a fixed text, namely 'Cheese Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "cheese"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=chemist with a fixed text, namely 'Drugstore' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "chemist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=chocolate with a fixed text, namely 'Chocolate Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "chocolate"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=clothes with a fixed text, namely 'Clothing Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "clothes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=coffee with a fixed text, namely 'Coffee Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "coffee"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=collector with a fixed text, namely 'Collectibles Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "collector"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=computer with a fixed text, namely 'Computer Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "computer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=confectionery with a fixed text, namely 'Candy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "confectionery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=convenience with a fixed text, namely 'Convenience Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "convenience"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=copyshop with a fixed text, namely 'Copy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "copyshop"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=cosmetics with a fixed text, namely 'Cosmetics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "cosmetics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=country_store with a fixed text, namely 'Rural Supplies Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "country_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=craft with a fixed text, namely 'Arts & Crafts Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "craft"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=curtain with a fixed text, namely 'Curtain Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "curtain"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=dairy with a fixed text, namely 'Dairy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "dairy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=deli with a fixed text, namely 'Delicatessen' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "deli"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=department_store with a fixed text, namely 'Department Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "department_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=doityourself with a fixed text, namely 'DIY Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "doityourself"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=doors with a fixed text, namely 'Door Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "doors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=dry_cleaning with a fixed text, namely 'Dry Cleaner' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "dry_cleaning"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=e-cigarette with a fixed text, namely 'E-Cigarette Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "e-cigarette"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=electrical with a fixed text, namely 'Electrical Equipment Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "electrical"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=electronics with a fixed text, namely 'Electronics Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "electronics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=erotic with a fixed text, namely 'Erotic Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "erotic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fabric with a fixed text, namely 'Fabric Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "fabric"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=farm with a fixed text, namely 'Produce Stand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "farm"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fashion_accessories with a fixed text, namely 'Fashion Accessories Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "fashion_accessories"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fireplace with a fixed text, namely 'Fireplace Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "fireplace"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fishing with a fixed text, namely 'Fishing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "fishing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=flooring with a fixed text, namely 'Flooring Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "flooring"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=florist with a fixed text, namely 'Florist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "florist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=frame with a fixed text, namely 'Framing Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "frame"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=frozen_food with a fixed text, namely 'Frozen Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "frozen_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=fuel with a fixed text, namely 'Fuel Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "fuel"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=funeral_directors with a fixed text, namely 'Funeral Home' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "funeral_directors"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=furniture with a fixed text, namely 'Furniture Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "furniture"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=games with a fixed text, namely 'Tabletop Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=garden_centre with a fixed text, namely 'Garden Center' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "garden_centre"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=gas with a fixed text, namely 'Bottled Gas Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "gas"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=general with a fixed text, namely 'General Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "general"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=gift with a fixed text, namely 'Gift Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "gift"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=greengrocer with a fixed text, namely 'Greengrocer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "greengrocer"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hairdresser with a fixed text, namely 'Hairdresser' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "hairdresser"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hairdresser_supply with a fixed text, namely 'Hairdresser Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "hairdresser_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hardware with a fixed text, namely 'Hardware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "hardware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=health_food with a fixed text, namely 'Health Food Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "health_food"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hearing_aids with a fixed text, namely 'Hearing Aids Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "hearing_aids"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=herbalist with a fixed text, namely 'Herbalist' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "herbalist"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hifi with a fixed text, namely 'Hifi Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "hifi"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=honey with a fixed text, namely 'Honey Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "honey"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=household_linen with a fixed text, namely 'Household Linen Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "household_linen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=houseware with a fixed text, namely 'Houseware Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "houseware"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=hunting with a fixed text, namely 'Hunting Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "hunting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=interior_decoration with a fixed text, namely 'Interior Decoration Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "interior_decoration"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=jewelry with a fixed text, namely 'Jewelry Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "jewelry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=kiosk with a fixed text, namely 'Kiosk' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "kiosk"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=kitchen with a fixed text, namely 'Kitchen Design Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "kitchen"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=laundry with a fixed text, namely 'Laundry' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "laundry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=leather with a fixed text, namely 'Leather Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "leather"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=lighting with a fixed text, namely 'Lighting Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "lighting"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=locksmith with a fixed text, namely 'Locksmith' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "locksmith"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=lottery with a fixed text, namely 'Lottery Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "lottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=mall with a fixed text, namely 'Mall' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "mall"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=massage with a fixed text, namely 'Massage Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "massage"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=medical_supply with a fixed text, namely 'Medical Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "medical_supply"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=military_surplus with a fixed text, namely 'Military Surplus Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "military_surplus"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=mobile_phone with a fixed text, namely 'Mobile Phone Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "mobile_phone"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=model with a fixed text, namely 'Model Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "model"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=money_lender with a fixed text, namely 'Money Lender' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "money_lender"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=motorcycle with a fixed text, namely 'Motorcycle Dealership' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "motorcycle"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=motorcycle_repair with a fixed text, namely 'Motorcycle Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "motorcycle_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=music with a fixed text, namely 'Music Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "music"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=musical_instrument with a fixed text, namely 'Musical Instrument Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "musical_instrument"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=newsagent with a fixed text, namely 'Newsstand' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "newsagent"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=nutrition_supplements with a fixed text, namely 'Nutrition Supplements Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "nutrition_supplements"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=nuts with a fixed text, namely 'Nuts Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "nuts"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=optician with a fixed text, namely 'Optician' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "optician"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=outdoor with a fixed text, namely 'Outdoors Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "outdoor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=outpost with a fixed text, namely 'Online Retailer Outpost' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "outpost"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=paint with a fixed text, namely 'Paint Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "paint"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=party with a fixed text, namely 'Party Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "party"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pasta with a fixed text, namely 'Pasta Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "pasta"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pastry with a fixed text, namely 'Pastry Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "pastry"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pawnbroker with a fixed text, namely 'Pawnshop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "pawnbroker"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=perfumery with a fixed text, namely 'Perfume Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "perfumery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pet with a fixed text, namely 'Pet Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "pet"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pet_grooming with a fixed text, namely 'Pet Groomer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "pet_grooming"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=photo with a fixed text, namely 'Photography Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "photo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pottery with a fixed text, namely 'Pottery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "pottery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=printer_ink with a fixed text, namely 'Printer Ink Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "printer_ink"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=psychic with a fixed text, namely 'Psychic' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "psychic"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=pyrotechnics with a fixed text, namely 'Fireworks Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "pyrotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=radiotechnics with a fixed text, namely 'Radio/Electronic Component Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "radiotechnics"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=religion with a fixed text, namely 'Religious Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "religion"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=rental with a fixed text, namely 'Rental Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=repair with a fixed text, namely 'Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=rice with a fixed text, namely 'Rice Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "rice"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=scuba_diving with a fixed text, namely 'Scuba Diving Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "scuba_diving"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=seafood with a fixed text, namely 'Seafood Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "seafood"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=second_hand with a fixed text, namely 'Thrift Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "second_hand"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=sewing with a fixed text, namely 'Sewing Supply Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "sewing"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=shoe_repair with a fixed text, namely 'Shoe Repair Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "shoe_repair"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=shoes with a fixed text, namely 'Shoe Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "shoes"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=spices with a fixed text, namely 'Spice Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "spices"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=sports with a fixed text, namely 'Sporting Goods Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=stationery with a fixed text, namely 'Stationery Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "stationery"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=storage_rental with a fixed text, namely 'Storage Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "storage_rental"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=supermarket with a fixed text, namely 'Supermarket' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "supermarket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=swimming_pool with a fixed text, namely 'Pool Supply Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "swimming_pool"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tailor with a fixed text, namely 'Tailor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "tailor"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tattoo with a fixed text, namely 'Tattoo Parlor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "tattoo"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tea with a fixed text, namely 'Tea Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "tea"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=telecommunication with a fixed text, namely 'Telecom Retail Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "telecommunication"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=ticket with a fixed text, namely 'Ticket Seller' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "ticket"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tiles with a fixed text, namely 'Tile Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "tiles"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tobacco with a fixed text, namely 'Tobacco Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "tobacco"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tool_hire with a fixed text, namely 'Tool Rental' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "tool_hire"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=toys with a fixed text, namely 'Toy Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "toys"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=trade with a fixed text, namely 'Trade Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "trade"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=travel_agency with a fixed text, namely 'Travel Agency' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "travel_agency"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=trophy with a fixed text, namely 'Trophy Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "trophy"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=tyres with a fixed text, namely 'Tire Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "tyres"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=vacuum_cleaner with a fixed text, namely 'Vacuum Cleaner Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "vacuum_cleaner"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=variety_store with a fixed text, namely 'Discount Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "variety_store"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=video with a fixed text, namely 'Video Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "video"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=video_games with a fixed text, namely 'Video Game Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "video_games"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=watches with a fixed text, namely 'Watches Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "watches"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=water with a fixed text, namely 'Drinking Water Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "water"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=water_sports with a fixed text, namely 'Watersport/Swim Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "water_sports"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=weapons with a fixed text, namely 'Weapon Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "weapons"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=wholesale with a fixed text, namely 'Wholesale Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "wholesale"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=wigs with a fixed text, namely 'Wig Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "wigs"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=window_blind with a fixed text, namely 'Window Blind Store' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "window_blind"
+    },
+    {
+      "key": "shop",
+      "description": "Layer 'Bike repair/shop' shows shop=wine with a fixed text, namely 'Wine Shop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if craft=)",
+      "value": "wine"
+    },
     {
       "key": "brand",
       "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'brand' (in the mapcomplete.org theme 'Personal theme')"
@@ -3011,6 +3835,83 @@
       "description": "Layer 'Bike repair/shop' shows service:bicycle:rental=no with a fixed text, namely 'This shop doesn't rent out bikes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if service:bicycle:rental~.+ | shop=bicycle | shop=sport | shop=bicycle_repair | shop=outdoor | shop=rental)",
       "value": "no"
     },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'rental' (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=city_bike with a fixed text, namely 'Normal city bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "city_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=ebike with a fixed text, namely 'Electrical bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "ebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=bmx with a fixed text, namely 'BMX bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "bmx"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=mtb with a fixed text, namely 'Mountainbikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "mtb"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=kid_bike with a fixed text, namely 'Bikes for children can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "kid_bike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=tandem with a fixed text, namely 'Tandem bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "tandem"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=racebike with a fixed text, namely 'Race bicycles can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "racebike"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=bike_helmet with a fixed text, namely 'Bike helmets can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "bike_helmet"
+    },
+    {
+      "key": "rental",
+      "description": "Layer 'Bike repair/shop' shows rental=cargo_bike with a fixed text, namely 'Cargo bikes can be rented here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if (service:bicycle:rental=yes | bicycle_rental~.+))",
+      "value": "cargo_bike"
+    },
+    {
+      "key": "capacity:city_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:city_bike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*city_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:ebike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:ebike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*ebike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:kid_bike",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:kid_bike' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*kid_bike.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:bmx",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bmx' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*bmx.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:mtb",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:mtb' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*mtb.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:bicycle_pannier",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:bicycle_pannier' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*bicycle_pannier.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
+    {
+      "key": "capacity:tandem_bicycle",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'capacity:tandem_bicycle' (in the mapcomplete.org theme 'Personal theme') (This is only shown if rental~^(.*tandem_bicycle.*)$ & (service:bicycle:rental=yes | bicycle_rental~.+))"
+    },
     {
       "key": "service:bicycle:pump",
       "description": "Layer 'Bike repair/shop' shows service:bicycle:pump=yes with a fixed text, namely 'This shop offers a bike pump for anyone' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if service:bicycle:pump~.+ | shop=bicycle | shop=bicycle_repair | service:bicycle:retail=yes | ^(service:bicycle:.+)$~~^(yes)$)",
@@ -3056,6 +3957,25 @@
       "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning=no with a fixed text, namely 'This shop doesn't offer bicycle cleaning' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if service:bicycle:cleaning~.+ | shop=bicycle | shop=bicycle_repair | ^(service:bicycle:.*)$~~^(yes|only)$)",
       "value": "no"
     },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'service:bicycle:cleaning:charge' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=no with a fixed text, namely 'The cleaning service is free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
+      "value": "no"
+    },
+    {
+      "key": "service:bicycle:cleaning:fee",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Personal theme') (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
+      "value": "yes"
+    },
+    {
+      "key": "service:bicycle:cleaning:charge",
+      "description": "Layer 'Bike repair/shop' shows service:bicycle:cleaning:fee=yes & service:bicycle:cleaning:charge= with a fixed text, namely 'Free to use' (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key service:bicycle:cleaning:charge. (This is only shown if amenity!=bike_wash & amenity!=bicycle_wash & service:bicycle:cleaning!=no & service:bicycle:cleaning~.+)",
+      "value": ""
+    },
     {
       "key": "internet_access",
       "description": "Layer 'Bike repair/shop' shows internet_access=wlan with a fixed text, namely 'This place offers wireless internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
@@ -3081,6 +4001,11 @@
       "description": "Layer 'Bike repair/shop' shows internet_access=wired with a fixed text, namely 'This place offers wired internet access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
       "value": "wired"
     },
+    {
+      "key": "internet_access",
+      "description": "Layer 'Bike repair/shop' shows internet_access=terminal;wifi with a fixed text, namely 'This place offers both wireless internet and internet access via a terminal or computer' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "terminal;wifi"
+    },
     {
       "key": "internet_access:fee",
       "description": "Layer 'Bike repair/shop' shows internet_access:fee=yes with a fixed text, namely 'There is a fee for the internet access at this place' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access!=no & internet_access~.+)",
@@ -3098,11 +4023,11 @@
     },
     {
       "key": "internet_access:ssid",
-      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)"
+      "description": "Layer 'Bike repair/shop' shows and asks freeform values for key 'internet_access:ssid' (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)"
     },
     {
       "key": "internet_access:ssid",
-      "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access=wlan)",
+      "description": "Layer 'Bike repair/shop' shows internet_access:ssid=Telekom with a fixed text, namely 'Telekom' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if internet_access~^(.*wlan.*)$)",
       "value": "Telekom"
     },
     {
@@ -9152,26 +10077,6 @@
       "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json
index 530f7fbec..2979f3237 100644
--- a/Docs/TagInfo/mapcomplete_pets.json
+++ b/Docs/TagInfo/mapcomplete_pets.json
@@ -330,26 +330,6 @@
       "description": "Layer 'Dog friendly eateries' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Dog friendly eateries' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Dog friendly eateries' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Dog friendly eateries' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Dog friendly eateries' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Dog friendly eateries shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/TagInfo/mapcomplete_ski.json b/Docs/TagInfo/mapcomplete_ski.json
index 97192c90d..0bcd856e2 100644
--- a/Docs/TagInfo/mapcomplete_ski.json
+++ b/Docs/TagInfo/mapcomplete_ski.json
@@ -1123,26 +1123,6 @@
       "description": "Layer 'Restaurants and fast food' shows cuisine=thai with a fixed text, namely 'Thai dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
       "value": "thai"
     },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=mexican   with a fixed text, namely 'Mexican dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
-      "value": "mexican  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=japanese   with a fixed text, namely 'Japanese dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
-      "value": "japanese  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=chicken   with a fixed text, namely 'Chicken based dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
-      "value": "chicken  "
-    },
-    {
-      "key": "cuisine",
-      "description": "Layer 'Restaurants and fast food' shows cuisine=seafood   with a fixed text, namely 'Seafood dishes are served here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Ski pistes and aerialways')",
-      "value": "seafood  "
-    },
     {
       "key": "image",
       "description": "The layer 'Restaurants and fast food shows images based on the keys image, image:0, image:1,... and  wikidata, wikipedia, wikimedia_commons and mapillary"
diff --git a/Docs/Themes/circular_economy.md b/Docs/Themes/circular_economy.md
index 05b16ab32..fed726d17 100644
--- a/Docs/Themes/circular_economy.md
+++ b/Docs/Themes/circular_economy.md
@@ -322,9 +322,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
diff --git a/Docs/Themes/climbing.md b/Docs/Themes/climbing.md
index 15e6121bf..e3931f108 100644
--- a/Docs/Themes/climbing.md
+++ b/Docs/Themes/climbing.md
@@ -347,9 +347,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -747,6 +744,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -755,174 +760,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Themes/fritures.md b/Docs/Themes/fritures.md
index 9f2bba558..62b761a19 100644
--- a/Docs/Themes/fritures.md
+++ b/Docs/Themes/fritures.md
@@ -110,7 +110,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -239,25 +239,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -564,29 +560,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Themes/glutenfree.md b/Docs/Themes/glutenfree.md
index a57249ff5..d7964a160 100644
--- a/Docs/Themes/glutenfree.md
+++ b/Docs/Themes/glutenfree.md
@@ -179,7 +179,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -319,25 +319,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -632,29 +628,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
@@ -1090,9 +1063,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -1477,6 +1447,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -1485,174 +1463,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Themes/healthcare.md b/Docs/Themes/healthcare.md
index e3b775da0..54b1857fa 100644
--- a/Docs/Themes/healthcare.md
+++ b/Docs/Themes/healthcare.md
@@ -335,9 +335,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -743,174 +740,6 @@ This tagrendering has labels
 -----|-----|----- |
 | accepts_cards.0 | Accepts payment cards | payment:cards=yes |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Themes/lactosefree.md b/Docs/Themes/lactosefree.md
index c088dfead..2d44ebcca 100644
--- a/Docs/Themes/lactosefree.md
+++ b/Docs/Themes/lactosefree.md
@@ -178,7 +178,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -318,25 +318,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -631,29 +627,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
@@ -1089,9 +1062,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -1476,6 +1446,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -1484,174 +1462,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Themes/lighthouses.md b/Docs/Themes/lighthouses.md
index 7447c242d..b3ab023a8 100644
--- a/Docs/Themes/lighthouses.md
+++ b/Docs/Themes/lighthouses.md
@@ -16,6 +16,7 @@ Available languages:
  - de
  - da
  - it
+ - es
 
 # Layers defined in this theme configuration file
 These layers can not be reused in different themes.
diff --git a/Docs/Themes/mapcomplete-changes.md b/Docs/Themes/mapcomplete-changes.md
index 14414047c..0b24d9ebf 100644
--- a/Docs/Themes/mapcomplete-changes.md
+++ b/Docs/Themes/mapcomplete-changes.md
@@ -14,6 +14,8 @@ This theme contains the following layers:
 Available languages:
 
  - en
+ - de
+ - es
 
 # Table of contents
 
diff --git a/Docs/Themes/memorials.md b/Docs/Themes/memorials.md
index 7ecf4537f..94f4958cb 100644
--- a/Docs/Themes/memorials.md
+++ b/Docs/Themes/memorials.md
@@ -23,6 +23,7 @@ Available languages:
  - nl
  - da
  - sl
+ - es
 
 # Layers defined in this theme configuration file
 These layers can not be reused in different themes.
diff --git a/Docs/Themes/openlovemap.md b/Docs/Themes/openlovemap.md
index 0962cc5cd..c2e95fe39 100644
--- a/Docs/Themes/openlovemap.md
+++ b/Docs/Themes/openlovemap.md
@@ -369,9 +369,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -803,174 +800,6 @@ This tagrendering has labels
 -----|-----|----- |
 | accepts_cards.0 | Accepts payment cards | payment:cards=yes |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
diff --git a/Docs/Themes/pets.md b/Docs/Themes/pets.md
index 042ac6dcd..5fdb66472 100644
--- a/Docs/Themes/pets.md
+++ b/Docs/Themes/pets.md
@@ -166,7 +166,7 @@ Elements must match **all** of the following expressions:
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/phone#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/phone/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [phone](https://wiki.openstreetmap.org/wiki/Key:phone) | [phone](../SpecialInputElements.md#phone) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/level#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/level/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [level](https://wiki.openstreetmap.org/wiki/Key:level) | [float](../SpecialInputElements.md#float) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/wheelchair#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/wheelchair/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [wheelchair](https://wiki.openstreetmap.org/wiki/Key:wheelchair) | Multiple choice | [designated](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Ddesignated) [yes](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dlimited) [no](https://wiki.openstreetmap.org/wiki/Tag:wheelchair%3Dno) |
-| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) [mexican  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ) [japanese  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ) [chicken  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ) [seafood  ](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ) |
+| <a target="_blank" href='https://taginfo.openstreetmap.org/keys/cuisine#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/cuisine/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [cuisine](https://wiki.openstreetmap.org/wiki/Key:cuisine) | [string](../SpecialInputElements.md#string) | [pizza](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza) [friture](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture) [pasta](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta) [kebab](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab) [sandwich](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich) [burger](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger) [sushi](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi) [coffee](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee) [italian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian) [french](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench) [chinese](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese) [greek](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek) [indian](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian) [turkish](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish) [thai](https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/website:menu#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/website%3Amenu/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [website:menu](https://wiki.openstreetmap.org/wiki/Key:website:menu) | [url](../SpecialInputElements.md#url) |  |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/reservation#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/reservation/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [reservation](https://wiki.openstreetmap.org/wiki/Key:reservation) | Multiple choice | [required](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drequired) [recommended](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Drecommended) [yes](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:reservation%3Dno) |
 | <a target="_blank" href='https://taginfo.openstreetmap.org/keys/takeaway#values'><img src='https://mapcomplete.org/assets/svg/search.svg' height='18px'></a> <a target="_blank" href='https://taghistory.raifer.tech/?#***/takeaway/'><img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'></a> [takeaway](https://wiki.openstreetmap.org/wiki/Key:takeaway) | Multiple choice | [only](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Donly) [yes](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:takeaway%3Dno) |
@@ -295,25 +295,21 @@ The question is `Is this place accessible with a wheelchair?`
 The question is `What kind of food is served here?`
 *This place mostly serves {cuisine}* is shown if `cuisine` is set
 
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍕' style='width: 3rem; height: 3rem'> *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍟' style='width: 3rem; height: 3rem'> *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍝' style='width: 3rem; height: 3rem'> *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥙' style='width: 3rem; height: 3rem'> *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🥪' style='width: 3rem; height: 3rem'> *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍔' style='width: 3rem; height: 3rem'> *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🍣' style='width: 3rem; height: 3rem'> *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/☕' style='width: 3rem; height: 3rem'> *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇹' style='width: 3rem; height: 3rem'> *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇫🇷' style='width: 3rem; height: 3rem'> *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇨🇳' style='width: 3rem; height: 3rem'> *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇬🇷' style='width: 3rem; height: 3rem'> *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇮🇳' style='width: 3rem; height: 3rem'> *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇷' style='width: 3rem; height: 3rem'> *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇹🇭' style='width: 3rem; height: 3rem'> *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇲🇽' style='width: 3rem; height: 3rem'> *Mexican dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dmexican  ' target='_blank'>mexican  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🇯🇵' style='width: 3rem; height: 3rem'> *Japanese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Djapanese  ' target='_blank'>japanese  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐔' style='width: 3rem; height: 3rem'> *Chicken based dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchicken  ' target='_blank'>chicken  </a>
- - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/🐟' style='width: 3rem; height: 3rem'> *Seafood dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dseafood  ' target='_blank'>seafood  </a>
+ -  *This is a pizzeria* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpizza' target='_blank'>pizza</a>
+ -  *This is a friture* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfriture' target='_blank'>friture</a>
+ -  *Mainly serves pasta* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dpasta' target='_blank'>pasta</a>
+ -  *This is kebab shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dkebab' target='_blank'>kebab</a>
+ -  *This is a sandwich shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsandwich' target='_blank'>sandwich</a>
+ -  *Burgers are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dburger' target='_blank'>burger</a>
+ -  *Sushi is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dsushi' target='_blank'>sushi</a>
+ -  *Coffee is served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dcoffee' target='_blank'>coffee</a>
+ -  *This is an Italian restaurant (which serves more than pasta and pizza)* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Ditalian' target='_blank'>italian</a>
+ -  *French dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dfrench' target='_blank'>french</a>
+ -  *Chinese dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dchinese' target='_blank'>chinese</a>
+ -  *Greek dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dgreek' target='_blank'>greek</a>
+ -  *Indian dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dindian' target='_blank'>indian</a>
+ -  *Turkish dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dturkish' target='_blank'>turkish</a>
+ -  *Thai dishes are served here* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:cuisine' target='_blank'>cuisine</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cuisine%3Dthai' target='_blank'>thai</a>
 
 ### show-menu-image
 
@@ -620,29 +616,6 @@ This tagrendering has labels
 | dogs.1 | Dogs allowed | dog=unleashed | dog=yes |
 | dogs.2 | No dogs allowed | dog=no |
 
-| id | question | osmTags |
------|-----|----- |
-| Cuisine.0 | *What kind of food is served here?* (default) |  |
-| Cuisine.1 | This is a pizzeria | cuisine=pizza |
-| Cuisine.2 | This is a friture | cuisine=friture |
-| Cuisine.3 | Mainly serves pasta | cuisine=pasta |
-| Cuisine.4 | This is kebab shop | cuisine=kebab |
-| Cuisine.5 | This is a sandwich shop | cuisine=sandwich |
-| Cuisine.6 | Burgers are served here | cuisine=burger |
-| Cuisine.7 | Sushi is served here | cuisine=sushi |
-| Cuisine.8 | Coffee is served here | cuisine=coffee |
-| Cuisine.9 | This is an Italian restaurant (which serves more than pasta and pizza) | cuisine=italian |
-| Cuisine.10 | French dishes are served here | cuisine=french |
-| Cuisine.11 | Chinese dishes are served here | cuisine=chinese |
-| Cuisine.12 | Greek dishes are served here | cuisine=greek |
-| Cuisine.13 | Indian dishes are served here | cuisine=indian |
-| Cuisine.14 | Turkish dishes are served here | cuisine=turkish |
-| Cuisine.15 | Thai dishes are served here | cuisine=thai |
-| Cuisine.16 | Mexican dishes are served here | cuisine=mexican   |
-| Cuisine.17 | Japanese dishes are served here | cuisine=japanese   |
-| Cuisine.18 | Chicken based dishes are served here | cuisine=chicken   |
-| Cuisine.19 | Seafood dishes are served here | cuisine=seafood   |
-
 | id | question | osmTags |
 -----|-----|----- |
 | has_internet.0 | Offers internet | internet_access=wlan | internet_access=yes | internet_access=wired |
@@ -892,9 +865,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -1292,6 +1262,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -1300,174 +1278,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Themes/sports.md b/Docs/Themes/sports.md
index f3868b1f9..2857cb9d5 100644
--- a/Docs/Themes/sports.md
+++ b/Docs/Themes/sports.md
@@ -327,9 +327,6 @@ The question is `What kind of shop is this?`
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/temaki-window.svg' style='width: 3rem; height: 3rem'> *Window Blind Store* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwindow_blind' target='_blank'>window_blind</a>
  - <img src='https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/./assets/layers/id_presets/maki-alcohol-shop.svg' style='width: 3rem; height: 3rem'> *Wine Shop* is shown if with <a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dwine' target='_blank'>wine</a>
 
-This tagrendering has labels 
-`description`
-
 ### brand
 
 The question is `What is the brand of this shop?`
@@ -727,6 +724,14 @@ This tagrendering has labels
 -----|-----|----- |
 | open_now.0 | Open now | _isOpen=yes |
 
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-type.0 | Only show shops selling {search} |  | search (string) |
+
+| id | question | osmTags | fields |
+-----|-----|-----|----- |
+| shop-name.0 | Only show shops with name {search} |  | search (string) |
+
 | id | question | osmTags |
 -----|-----|----- |
 | second_hand.0 | Only show shops selling second-hand items | shop=second_hand | shop=charity | second_hand=yes | second_hand=only | service:bicycle:second_hand~^(yes|only)$ |
@@ -735,174 +740,6 @@ This tagrendering has labels
 -----|-----|----- |
 | has_organic.0 | Has organic options | organic=yes | organic=only |
 
-| id | question | osmTags |
------|-----|----- |
-| shop_types.0 | *What kind of shop is this?* (default) |  |
-| shop_types.1 | Bicycle rental shop | shop=bicycle_rental |
-| shop_types.2 | Farm Supply Shop | shop=agrarian |
-| shop_types.3 | Liquor Store | shop=alcohol |
-| shop_types.4 | Anime / Manga Shop | shop=anime |
-| shop_types.5 | Antique Shop | shop=antiques |
-| shop_types.6 | Appliance Store | shop=appliance |
-| shop_types.7 | Art Store | shop=art |
-| shop_types.8 | Baby Goods Store | shop=baby_goods |
-| shop_types.9 | Bag/Luggage Store | shop=bag |
-| shop_types.10 | Bakery | shop=bakery |
-| shop_types.11 | Bathroom Furnishing Store | shop=bathroom_furnishing |
-| shop_types.12 | Beauty Shop | shop=beauty |
-| shop_types.13 | Bedding/Mattress Store | shop=bed |
-| shop_types.14 | Beverage Store | shop=beverages |
-| shop_types.15 | Bicycle Shop | shop=bicycle |
-| shop_types.16 | Boat Store | shop=boat |
-| shop_types.17 | Bookmaker | shop=bookmaker |
-| shop_types.18 | Bookstore | shop=books |
-| shop_types.19 | Brewing Supply Store | shop=brewing_supplies |
-| shop_types.20 | Butcher | shop=butcher |
-| shop_types.21 | Camera Equipment Store | shop=camera |
-| shop_types.22 | Candle Shop | shop=candles |
-| shop_types.23 | Cannabis Shop | shop=cannabis |
-| shop_types.24 | Car Dealership | shop=car |
-| shop_types.25 | Car Parts Store | shop=car_parts |
-| shop_types.26 | Car Repair Shop | shop=car_repair |
-| shop_types.27 | RV Dealership | shop=caravan |
-| shop_types.28 | Carpet Store | shop=carpet |
-| shop_types.29 | Catalog Shop | shop=catalogue |
-| shop_types.30 | Charity Store | shop=charity |
-| shop_types.31 | Cheese Store | shop=cheese |
-| shop_types.32 | Drugstore | shop=chemist |
-| shop_types.33 | Chocolate Store | shop=chocolate |
-| shop_types.34 | Clothing Store | shop=clothes |
-| shop_types.35 | Coffee Store | shop=coffee |
-| shop_types.36 | Collectibles Shop | shop=collector |
-| shop_types.37 | Computer Store | shop=computer |
-| shop_types.38 | Candy Store | shop=confectionery |
-| shop_types.39 | Convenience Store | shop=convenience |
-| shop_types.40 | Copy Store | shop=copyshop |
-| shop_types.41 | Cosmetics Store | shop=cosmetics |
-| shop_types.42 | Rural Supplies Store | shop=country_store |
-| shop_types.43 | Arts & Crafts Store | shop=craft |
-| shop_types.44 | Curtain Store | shop=curtain |
-| shop_types.45 | Dairy Store | shop=dairy |
-| shop_types.46 | Delicatessen | shop=deli |
-| shop_types.47 | Department Store | shop=department_store |
-| shop_types.48 | DIY Store | shop=doityourself |
-| shop_types.49 | Door Shop | shop=doors |
-| shop_types.50 | Dry Cleaner | shop=dry_cleaning |
-| shop_types.51 | E-Cigarette Shop | shop=e-cigarette |
-| shop_types.52 | Electrical Equipment Store | shop=electrical |
-| shop_types.53 | Electronics Store | shop=electronics |
-| shop_types.54 | Erotic Store | shop=erotic |
-| shop_types.55 | Fabric Store | shop=fabric |
-| shop_types.56 | Produce Stand | shop=farm |
-| shop_types.57 | Fashion Accessories Store | shop=fashion_accessories |
-| shop_types.58 | Fireplace Store | shop=fireplace |
-| shop_types.59 | Fishing Shop | shop=fishing |
-| shop_types.60 | Flooring Supply Shop | shop=flooring |
-| shop_types.61 | Florist | shop=florist |
-| shop_types.62 | Framing Shop | shop=frame |
-| shop_types.63 | Frozen Food Store | shop=frozen_food |
-| shop_types.64 | Fuel Shop | shop=fuel |
-| shop_types.65 | Funeral Home | shop=funeral_directors |
-| shop_types.66 | Furniture Store | shop=furniture |
-| shop_types.67 | Tabletop Game Store | shop=games |
-| shop_types.68 | Garden Center | shop=garden_centre |
-| shop_types.69 | Bottled Gas Shop | shop=gas |
-| shop_types.70 | General Store | shop=general |
-| shop_types.71 | Gift Shop | shop=gift |
-| shop_types.72 | Greengrocer | shop=greengrocer |
-| shop_types.73 | Hairdresser | shop=hairdresser |
-| shop_types.74 | Hairdresser Supply Store | shop=hairdresser_supply |
-| shop_types.75 | Hardware Store | shop=hardware |
-| shop_types.76 | Health Food Store | shop=health_food |
-| shop_types.77 | Hearing Aids Store | shop=hearing_aids |
-| shop_types.78 | Herbalist | shop=herbalist |
-| shop_types.79 | Hifi Store | shop=hifi |
-| shop_types.80 | Honey Store | shop=honey |
-| shop_types.81 | Household Linen Shop | shop=household_linen |
-| shop_types.82 | Houseware Store | shop=houseware |
-| shop_types.83 | Hunting Shop | shop=hunting |
-| shop_types.84 | Interior Decoration Store | shop=interior_decoration |
-| shop_types.85 | Jewelry Store | shop=jewelry |
-| shop_types.86 | Kiosk | shop=kiosk |
-| shop_types.87 | Kitchen Design Store | shop=kitchen |
-| shop_types.88 | Laundry | shop=laundry |
-| shop_types.89 | Leather Store | shop=leather |
-| shop_types.90 | Lighting Store | shop=lighting |
-| shop_types.91 | Locksmith | shop=locksmith |
-| shop_types.92 | Lottery Shop | shop=lottery |
-| shop_types.93 | Mall | shop=mall |
-| shop_types.94 | Massage Shop | shop=massage |
-| shop_types.95 | Medical Supply Store | shop=medical_supply |
-| shop_types.96 | Military Surplus Store | shop=military_surplus |
-| shop_types.97 | Mobile Phone Store | shop=mobile_phone |
-| shop_types.98 | Model Shop | shop=model |
-| shop_types.99 | Money Lender | shop=money_lender |
-| shop_types.100 | Motorcycle Dealership | shop=motorcycle |
-| shop_types.101 | Motorcycle Repair Shop | shop=motorcycle_repair |
-| shop_types.102 | Music Store | shop=music |
-| shop_types.103 | Musical Instrument Store | shop=musical_instrument |
-| shop_types.104 | Newsstand | shop=newsagent |
-| shop_types.105 | Nutrition Supplements Store | shop=nutrition_supplements |
-| shop_types.106 | Nuts Shop | shop=nuts |
-| shop_types.107 | Optician | shop=optician |
-| shop_types.108 | Outdoors Store | shop=outdoor |
-| shop_types.109 | Online Retailer Outpost | shop=outpost |
-| shop_types.110 | Paint Store | shop=paint |
-| shop_types.111 | Party Supply Store | shop=party |
-| shop_types.112 | Pasta Store | shop=pasta |
-| shop_types.113 | Pastry Shop | shop=pastry |
-| shop_types.114 | Pawnshop | shop=pawnbroker |
-| shop_types.115 | Perfume Store | shop=perfumery |
-| shop_types.116 | Pet Store | shop=pet |
-| shop_types.117 | Pet Groomer | shop=pet_grooming |
-| shop_types.118 | Photography Store | shop=photo |
-| shop_types.119 | Pottery Store | shop=pottery |
-| shop_types.120 | Printer Ink Store | shop=printer_ink |
-| shop_types.121 | Psychic | shop=psychic |
-| shop_types.122 | Fireworks Store | shop=pyrotechnics |
-| shop_types.123 | Radio/Electronic Component Store | shop=radiotechnics |
-| shop_types.124 | Religious Store | shop=religion |
-| shop_types.125 | Rental Shop | shop=rental |
-| shop_types.126 | Repair Shop | shop=repair |
-| shop_types.127 | Rice Store | shop=rice |
-| shop_types.128 | Scuba Diving Shop | shop=scuba_diving |
-| shop_types.129 | Seafood Shop | shop=seafood |
-| shop_types.130 | Thrift Store | shop=second_hand |
-| shop_types.131 | Sewing Supply Shop | shop=sewing |
-| shop_types.132 | Shoe Repair Shop | shop=shoe_repair |
-| shop_types.133 | Shoe Store | shop=shoes |
-| shop_types.134 | Spice Shop | shop=spices |
-| shop_types.135 | Sporting Goods Store | shop=sports |
-| shop_types.136 | Stationery Store | shop=stationery |
-| shop_types.137 | Storage Rental | shop=storage_rental |
-| shop_types.138 | Supermarket | shop=supermarket |
-| shop_types.139 | Pool Supply Store | shop=swimming_pool |
-| shop_types.140 | Tailor | shop=tailor |
-| shop_types.141 | Tattoo Parlor | shop=tattoo |
-| shop_types.142 | Tea Store | shop=tea |
-| shop_types.143 | Telecom Retail Store | shop=telecommunication |
-| shop_types.144 | Ticket Seller | shop=ticket |
-| shop_types.145 | Tile Shop | shop=tiles |
-| shop_types.146 | Tobacco Shop | shop=tobacco |
-| shop_types.147 | Tool Rental | shop=tool_hire |
-| shop_types.148 | Toy Store | shop=toys |
-| shop_types.149 | Trade Shop | shop=trade |
-| shop_types.150 | Travel Agency | shop=travel_agency |
-| shop_types.151 | Trophy Shop | shop=trophy |
-| shop_types.152 | Tire Store | shop=tyres |
-| shop_types.153 | Vacuum Cleaner Store | shop=vacuum_cleaner |
-| shop_types.154 | Discount Store | shop=variety_store |
-| shop_types.155 | Video Store | shop=video |
-| shop_types.156 | Video Game Store | shop=video_games |
-| shop_types.157 | Watches Shop | shop=watches |
-| shop_types.158 | Drinking Water Shop | shop=water |
-| shop_types.159 | Watersport/Swim Shop | shop=water_sports |
-| shop_types.160 | Weapon Shop | shop=weapons |
-| shop_types.161 | Wholesale Store | shop=wholesale |
-| shop_types.162 | Wig Shop | shop=wigs |
-| shop_types.163 | Window Blind Store | shop=window_blind |
-| shop_types.164 | Wine Shop | shop=wine |
-
 | id | question | osmTags |
 -----|-----|----- |
 | accepts_cash.0 | Accepts cash | payment:cash=yes |
diff --git a/Docs/Themes/waste_basket.md b/Docs/Themes/waste_basket.md
index 26efbbffc..6753d74d2 100644
--- a/Docs/Themes/waste_basket.md
+++ b/Docs/Themes/waste_basket.md
@@ -4,7 +4,7 @@
 _This document details some technical information about this MapComplete theme, mostly about the attributes used in the theme. Various links point toward more information about the attributes, e.g. to the OpenStreetMap-wiki, to TagInfo or tools creating statistics_
 The theme introduction reads:
 
-> On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself
+> On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself.
 
 This theme contains the following layers:
 
diff --git a/Docs/URL_Parameters.md b/Docs/URL_Parameters.md
index b52a8d1db..e70b18ba2 100644
--- a/Docs/URL_Parameters.md
+++ b/Docs/URL_Parameters.md
@@ -411,7 +411,7 @@ The default value is _true_
 
 The mode the application starts in, e.g. 'map', 'dashboard' or 'statistics'
 
-This documentation is defined in the source code at [generateDocs.ts](ervdvn/git/MapComplete/scripts/generateDocs.ts#L436)
+This documentation is defined in the source code at [generateDocs.ts](ervdvn/git2/MapComplete/scripts/generateDocs.ts#L436)
 
 The default value is _map_
 
diff --git a/Docs/wikiIndex.txt b/Docs/wikiIndex.txt
index 62abfa16e..2d7e14147 100644
--- a/Docs/wikiIndex.txt
+++ b/Docs/wikiIndex.txt
@@ -301,7 +301,7 @@
 {{service_item
 |name= [https://mapcomplete.org/fireplace fireplace]
 |region= Worldwide
-|lang= {{#language:de|en}}, {{#language:en|en}}
+|lang= {{#language:de|en}}, {{#language:en|en}}, {{#language:es|en}}
 |descr= A MapComplete theme: Outdoor place to make a fire or a fixed barbecue in an official place
 |material= {{yes|[https://mapcomplete.org/ Yes]}}
 |image= MapComplete_Screenshot.png
@@ -420,7 +420,7 @@ The position of a signpost can be used by a hiker/biker/rider/s…
 {{service_item
 |name= [https://mapcomplete.org/lighthouses lighthouses]
 |region= Worldwide
-|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:it|en}}
+|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:es|en}}
 |descr= A MapComplete theme: Lighthouses are tall buildings with a light on top to guide marine traffic
 |material= {{yes|[https://mapcomplete.org/ Yes]}}
 |image= MapComplete_Screenshot.png
@@ -447,7 +447,7 @@ The position of a signpost can be used by a hiker/biker/rider/s…
 {{service_item
 |name= [https://mapcomplete.org/memorials memorials]
 |region= Worldwide
-|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:nl|en}}
+|lang= {{#language:en|en}}, {{#language:de|en}}, {{#language:fr|en}}, {{#language:nl|en}}, {{#language:es|en}}
 |descr= A MapComplete theme: Memorials are physical objects permantently placed in the public space to remember a person or event
 |material= {{yes|[https://mapcomplete.org/ Yes]}}
 |image= MapComplete_Screenshot.png
diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json
index 474efdc10..5eabcfc07 100644
--- a/assets/layers/advertising/advertising.json
+++ b/assets/layers/advertising/advertising.json
@@ -468,11 +468,14 @@
       ],
       "title": {
         "en": "a billboard mounted to a wall",
-        "de": "Eine an einer Wand montierte Werbetafel"
+        "de": "Eine an einer Wand montierte Werbetafel",
+        "cs": "billboard připevněný na stěnu"
       },
       "description": {
         "en": "A large outdoor advertising structure, typically found in high-traffic areas such as alongside busy roads mounted on a wall",
-        "de": "Eine große Außenwerbestruktur, die typischerweise in stark frequentierten Bereichen wie an vielbefahrenen Straßen auf einer Wand montiert zu finden ist"
+        "de": "Eine große Außenwerbestruktur, die typischerweise in stark frequentierten Bereichen wie an vielbefahrenen Straßen auf einer Wand montiert zu finden ist",
+        "cs": "Velká venkovní reklamní konstrukce, která se obvykle nachází na frekventovaných místech, například podél frekventovaných silnic, umístěná na zdi",
+        "pl": "Duży obiekt reklamowy na zewnątrz, zazwyczaj znajduje się w obszarach z dużym ruchem, np. obok ruchliwych dróg na ścianie"
       },
       "exampleImages": [
         "./assets/themes/advertising/billboard_wall.jpg"
@@ -531,7 +534,8 @@
         "de": "ein Plakatkasten, der zu einem Unterstand für öffentliche Verkehrsmittel gehört",
         "fr": "Un affichage sur un abribus",
         "it": "un contenitore di poster pubblicitari di una pensilina del trasporto pubblico",
-        "es": "una caja de carteles que forma parte de una marquesina de transporte público"
+        "es": "una caja de carteles que forma parte de una marquesina de transporte público",
+        "cs": "plakátovací skříňka, která je součástí přístřešku veřejné dopravy"
       },
       "snapToLayer": [
         "shelter"
@@ -694,7 +698,8 @@
         "de": "ein Bildschirm, der an einem Wartehäuschen angebracht ist",
         "fr": "un écran fixé sur un abri de transport",
         "it": "uno schermo montato su una pensilina del traporto pubblico",
-        "es": "una pantalla montada en una marquesina de tránsito"
+        "es": "una pantalla montada en una marquesina de tránsito",
+        "cs": "obrazovka namontovaná na dopravním přístřešku"
       },
       "snapToLayer": [
         "shelter"
diff --git a/assets/layers/aerialway/aerialway.json b/assets/layers/aerialway/aerialway.json
index a0e69bbf6..8b32c5fbc 100644
--- a/assets/layers/aerialway/aerialway.json
+++ b/assets/layers/aerialway/aerialway.json
@@ -2,13 +2,15 @@
   "id": "aerialway",
   "name": {
     "en": "Aerialways",
-    "de": "Seilbahnen"
+    "de": "Seilbahnen",
+    "cs": "Letecké trasy"
   },
   "description": {
     "en": "Various forms of transport for passengers and goods that use wires, including cable cars, gondolas, chair lifts, drag lifts, and zip lines. ",
     "de": "Alle Arten von seil- oder drahtgestütztem Personen- oder Gütertransport, wie Seilbahnen, Gondeln, Sessellifte, Schlepplifte. ",
     "es": "Diversas formas de transporte de pasajeros y mercancías que utilizan cables, como teleféricos, telecabinas, telesillas, telesquíes y tirolinas. ",
-    "pl": "Różne formy transportu dla pasażerów i dóbr, które używają lin, w tym kolejki gondolowe, wyciągi krzesełkowe i orczykowe oraz tyrolki. "
+    "pl": "Różne formy transportu dla pasażerów i dóbr, które używają lin, w tym kolejki gondolowe, wyciągi krzesełkowe i orczykowe oraz tyrolki. ",
+    "cs": "Různé formy přepravy osob a zboží, které využívají dráty, včetně lanovek, gondol, sedačkových lanovek, vleků a lanových drah. "
   },
   "source": {
     "osmTags": {
@@ -49,7 +51,8 @@
           "de": "{name}",
           "fr": "{name}",
           "pl": "{name}",
-          "es": "{name}"
+          "es": "{name}",
+          "cs": "{name}"
         },
         "condition": "name~*",
         "classes": "bg-white p-1 px-2 rounded"
@@ -179,14 +182,16 @@
         "de": "Wie lange dauert eine Fahrt mit diesem Aufzug?",
         "fr": "Combien de temps dure le trajet dans cet ascenseur ?",
         "pl": "Jak długo trwa pojedynczy przejazd tą windą?",
-        "es": "¿Cuánto dura un viaje en este ascensor?"
+        "es": "¿Cuánto dura un viaje en este ascensor?",
+        "cs": "Jak dlouho trvá jedna jízda tímto výtahem?"
       },
       "questionHint": {
         "en": "This excludes the waiting time.",
         "de": "Dies schließt die Wartezeit aus.",
         "fr": "Cela n'inclut pas le temps d'attente.",
         "pl": "To nie włącza czasu oczekiwania.",
-        "es": "Esto elimina el tiempo de espera."
+        "es": "Esto elimina el tiempo de espera.",
+        "cs": "To nezahrnuje čekací dobu."
       },
       "freeform": {
         "key": "duration"
@@ -196,7 +201,8 @@
         "de": "Eine Fahrt dauert {duration} Minuten",
         "fr": "Un aller simple dure {duration} minutes",
         "pl": "Pojedynczy przejazd trwa {duration} minut",
-        "es": "Un viaje dura {duration} minutos"
+        "es": "Un viaje dura {duration} minutos",
+        "cs": "Jedna jízda trvá {duration} minut"
       }
     },
     {
diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json
index 36cd15328..346d25ea5 100644
--- a/assets/layers/atm/atm.json
+++ b/assets/layers/atm/atm.json
@@ -241,7 +241,7 @@
       "id": "cash_out",
       "question": {
         "en": "Can you withdraw cash from this ATM?",
-        "de": "Kann man an diesem Geldautomaten Bargeld abheben?",
+        "de": "Kann man am Automaten Bargeld abheben?",
         "nl": "Kan je geld ophalen bij deze geldautomaat?",
         "nb_NO": "Kan man gjøre uttak fra denne minibanken?",
         "ca": "Pots retirar diners des d'aquest caixer?",
@@ -257,7 +257,7 @@
           "if": "cash_out=",
           "then": {
             "en": "You can withdraw cash from this ATM",
-            "de": "Sie können an diesem Geldautomaten Bargeld abheben",
+            "de": "Am Geldautomaten kann Bargeld abgehoben werden",
             "nl": "Je kan geld ophalen bij deze geldautomaat",
             "ca": "Pots retirar diners a aquest caixer",
             "nb_NO": "Du kan gjøre uttak i denne minibanken",
@@ -275,7 +275,7 @@
           "if": "cash_out=yes",
           "then": {
             "en": "You can withdraw cash from this ATM",
-            "de": "An diesem Geldautomaten können Sie Bargeld abheben",
+            "de": "Am Automaten kann Bargeld abgehoben werden",
             "nl": "Je kan geld ophalen bij deze geldautomaat",
             "ca": "Pots retirar diners des d'aquest caixer",
             "cs": "Z tohoto bankomatu můžete vybírat hotovost",
@@ -290,7 +290,7 @@
           "if": "cash_out=no",
           "then": {
             "en": "You cannot withdraw cash from this ATM",
-            "de": "Sie können an diesem Geldautomaten kein Bargeld abheben",
+            "de": "Am Automaten kann kein Bargeld abgehoben werden",
             "nl": "Je kan geen geld ophalen bij deze geldautomaat",
             "ca": "No pots retirar diners des d'aquest caixer",
             "cs": "Z tohoto bankomatu nelze vybírat hotovost",
@@ -361,7 +361,7 @@
           "if": "cash_in=no",
           "then": {
             "en": "You cannot deposit cash into this ATM",
-            "de": "Sie können an diesem Geldautomaten kein Bargeld einzahlen",
+            "de": "Am Geldautomaten kann kein Bargeld eingezahlt werden",
             "nl": "Je kan geen geld deponeren in deze geldautomaat",
             "nb_NO": "Du kan ikke gjøre innskudd i denne minibanken",
             "ca": "No pots dipositar diners a aquest caixer",
@@ -399,7 +399,7 @@
         "en": "What notes can you withdraw here?",
         "nl": "Welke bankbiljetten kan je hier afhalen?",
         "fr": "Quels billets pouvez-vous retirer ici ?",
-        "de": "Welche Geldscheine können Sie hier abheben?",
+        "de": "Welche Geldscheine können abgehoben werden?",
         "cs": "Jaké bankovky zde můžete vybírat?",
         "he": "אילו הערות תוכל למשוך כאן?",
         "ca": "Quins bitllets pots retirar aquí?",
@@ -465,7 +465,7 @@
           "then": {
             "en": "50 euro notes can be withdrawn",
             "nl": "Je kunt biljetten van 50 euro afhalen",
-            "de": "Es können 50-Euro-Scheine abgehoben werden",
+            "de": "50-Euro-Scheine können abgehoben werden",
             "cs": "50 eurové bankovky lze vybírat",
             "ca": "es poden retirar bitllets de 50 euros",
             "fr": "On peut retirer des billets de 50 euros",
@@ -529,7 +529,7 @@
       "id": "speech_output",
       "question": {
         "en": "Does this ATM have speech output for visually impaired users?",
-        "de": "Verfügt dieser Geldautomat über eine Sprachausgabe für sehbehinderte Benutzer?",
+        "de": "Ist eine Sprachausgabe für Sehbehinderte vorhanden?",
         "nl": "Heeft deze automaat spraak voor slechtziende en blinde gebruikers?",
         "ca": "Aquest caixer té un lector de pantalla per a usuaris amb discapacitat visual?",
         "cs": "Má tento bankomat hlasový výstup pro zrakově postižené uživatele?",
@@ -543,7 +543,7 @@
           "if": "speech_output=yes",
           "then": {
             "en": "This ATM has speech output, usually available through a headphone jack",
-            "de": "Dieser Geldautomat verfügt über eine Sprachausgabe, die normalerweise über eine Kopfhörerbuchse verfügbar ist",
+            "de": "Der Geldautomat hat eine Sprachausgabe, in der Regel verfügbar über eine Kopfhörerbuchse",
             "nl": "Deze automaat heeft spraak, waarschijnlijk beschikbaar via een hoofdtelefoon-aansluiting",
             "ca": "Aquest caixer té lector de pantalla, normalment disponible a través d'un connector d'auriculars \"jack\"",
             "cs": "Tento bankomat má řečový výstup, který je obvykle dostupný přes konektor pro sluchátka",
@@ -557,7 +557,7 @@
           "if": "speech_output=no",
           "then": {
             "en": "This ATM does not have speech output",
-            "de": "Dieser Geldautomat hat keine Sprachausgabe",
+            "de": "Der Geldautomat hat keine Sprachausgabe",
             "nl": "Deze automaat heeft geen spraak",
             "ca": "Aquest caixer no té lector de pantalla",
             "cs": "Tento bankomat nemá hlasový výstup",
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index b9f5f8ccf..34eba6568 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -964,7 +964,8 @@
             "es": "Dunlop",
             "cs": "Dunlop",
             "ca": "Dunlop",
-            "eu": "Dunlop"
+            "eu": "Dunlop",
+            "pl": "Dunlop"
           }
         },
         {
diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json
index ac897ee90..6d54d60be 100644
--- a/assets/layers/cafe_pub/cafe_pub.json
+++ b/assets/layers/cafe_pub/cafe_pub.json
@@ -67,7 +67,8 @@
           "es": "<i>{name}</i>",
           "fr": "<i>{name}</i>",
           "eu": "<i>{name}</i>",
-          "cs": "<i>{name}</i>"
+          "cs": "<i>{name}</i>",
+          "pl": "<i>{name}</i>"
         }
       },
       {
diff --git a/assets/layers/climbing_area/climbing_area.json b/assets/layers/climbing_area/climbing_area.json
index c8e08740f..6f1006fea 100644
--- a/assets/layers/climbing_area/climbing_area.json
+++ b/assets/layers/climbing_area/climbing_area.json
@@ -271,7 +271,7 @@
           "then": {
             "en": "A climbing boulder - a single rock or cliff with one or a few climbing routes which can be climbed safely without rope",
             "fr": "Rocher d’escalade, rocher avec une ou peu de voie permettant d’escalader sans corde",
-            "de": "Ein Kletterfelsen - ein einzelner Felsen oder eine Klippe mit einer oder wenigen Kletterrouten, die ohne Seil sicher bestiegen werden können",
+            "de": "Ein Boulderfelsen - ein einzelner Felsen oder eine Klippe mit einer oder wenigen Boulderrouten, die ohne Seil sicher bestiegen werden können",
             "it": "Un masso per arrampicata (una singola roccia o falesia con una o poche vie di arrampicata che possono essere scalate in sicurezza senza una corda)",
             "nl": "Een klimboulder - een enkele rots of klif met één of enkele klimroutes die veilig zonder touw kunnen worden beklommen",
             "ca": "Una roca d'escalada: una única roca o penya-segat amb una o unes quantes vies d'escalada que es poden escalar amb seguretat sense corda",
@@ -330,7 +330,8 @@
             "pa_PK": "چونہ پتھر",
             "eu": "Kareharria",
             "ca": "Calcària",
-            "cs": "Vápenec"
+            "cs": "Vápenec",
+            "pl": "Wapień"
           }
         }
       ],
diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index 7cb41e36c..7d7d64e42 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -8,7 +8,8 @@
     "es": "Entrada",
     "fr": "Entrée",
     "pa_PK": "دروازہ",
-    "cs": "Vchod"
+    "cs": "Vchod",
+    "pl": "Wejście"
   },
   "description": {
     "en": "A layer showing entrances and offering capabilities to survey some advanced data which is important for e.g. wheelchair users (but also bicycle users, people who want to deliver, …)",
diff --git a/assets/layers/food/food.json b/assets/layers/food/food.json
index 5b7fa9fdd..645d4876f 100644
--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@@ -91,7 +91,8 @@
           "ca": "Menjar ràpid",
           "es": "Comida rápida",
           "fr": "Fast-food",
-          "cs": "Rychlé občerstvení"
+          "cs": "Rychlé občerstvení",
+          "pl": "Fastfood"
         }
       }
     ]
diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json
index 9174d1ee8..89b91ec4c 100644
--- a/assets/layers/ghost_bike/ghost_bike.json
+++ b/assets/layers/ghost_bike/ghost_bike.json
@@ -266,7 +266,8 @@
         "it": "<i>{inscription}</i>",
         "ru": "<i>{inscription}</i>",
         "id": "<i>{inscription}</i>",
-        "cs": "<i>{inscription}</i>"
+        "cs": "<i>{inscription}</i>",
+        "pl": "<i>{inscription}</i>"
       },
       "freeform": {
         "key": "inscription"
diff --git a/assets/layers/memorial/memorial.json b/assets/layers/memorial/memorial.json
index 83fc6e897..95bcd8475 100644
--- a/assets/layers/memorial/memorial.json
+++ b/assets/layers/memorial/memorial.json
@@ -389,7 +389,8 @@
         "ru": "Установлен {start_date}",
         "de": "Aufgestellt am {start_date}",
         "ca": "Col·locat el {start_date}",
-        "cs": "Umístěno {start_date}"
+        "cs": "Umístěno {start_date}",
+        "sl": "Datum postavitve {start_date}"
       },
       "freeform": {
         "key": "start_date",
diff --git a/assets/layers/picnic_table/picnic_table.json b/assets/layers/picnic_table/picnic_table.json
index 077bbe95b..c0b9acb42 100644
--- a/assets/layers/picnic_table/picnic_table.json
+++ b/assets/layers/picnic_table/picnic_table.json
@@ -151,7 +151,8 @@
           "if": "material=metal",
           "then": {
             "en": "This picnic table is made from metal",
-            "nl": "Deze picnictafel is gemaakt uit metaal"
+            "nl": "Deze picnictafel is gemaakt uit metaal",
+            "de": "Der Picknicktisch ist aus Metall"
           }
         }
       ],
diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json
index 3189cb613..57bd40a40 100644
--- a/assets/layers/playground/playground.json
+++ b/assets/layers/playground/playground.json
@@ -139,7 +139,8 @@
     {
       "question": {
         "en": "Does one have to pay to use this playground?",
-        "nl": "Moet men betalen om deze speeltuin te gebruiken?"
+        "nl": "Moet men betalen om deze speeltuin te gebruiken?",
+        "de": "Muss man zahlen, um den Spielplatz zu nutzen?"
       },
       "id": "fee",
       "mappings": [
@@ -148,14 +149,16 @@
           "alsoShowIf": "fee=",
           "then": {
             "en": "Free to use",
-            "nl": "Gratis te gebruiken"
+            "nl": "Gratis te gebruiken",
+            "de": "Nutzung kostenlos"
           }
         },
         {
           "if": "fee=yes",
           "then": {
             "en": "Paid playground",
-            "nl": "Betalend"
+            "nl": "Betalend",
+            "de": "Gebührenpflichtiger Spielplatz"
           }
         }
       ],
@@ -575,7 +578,7 @@
         "en": "What is the email address of the playground maintainer?",
         "it": "Qual è l’indirizzo email del gestore di questo parco giochi?",
         "fr": "Quelle est l'adresse électronique du responsable de l'aire de jeux ?",
-        "de": "Wie lautet die E-Mail Adresse des Spielplatzbetreuers?",
+        "de": "Wie lautet die E-Mail Adresse des Spielplatzbetreibers?",
         "ca": "Quina és l'adreça de correu electrònic del mantenidor del parc infantil?",
         "cs": "Jaká je e-mailová adresa správce hřiště?"
       },
@@ -604,7 +607,7 @@
         "en": "What is the phone number of the playground maintainer?",
         "fr": "Quel est le numéro de téléphone du responsable du terrain de jeux ?",
         "it": "Qual è il numero di telefono del gestore del campetto?",
-        "de": "Wie lautet die Telefonnummer vom Betreiber des Spielplatzes?",
+        "de": "Wie lautet die Telefonnummer des Spielplatzbetreibers?",
         "ca": "Quin és el telèfon del mantenidor del parc infantil?",
         "cs": "Jaké je telefonní číslo na správce hřiště?"
       },
diff --git a/assets/layers/playground_equipment/playground_equipment.json b/assets/layers/playground_equipment/playground_equipment.json
index 882c4dd4e..3b3ff9b87 100644
--- a/assets/layers/playground_equipment/playground_equipment.json
+++ b/assets/layers/playground_equipment/playground_equipment.json
@@ -2,7 +2,7 @@
   "id": "playground_equipment",
   "name": {
     "en": "Playground equipment",
-    "de": "Spielplatzausstattung"
+    "de": "Spielgeräte"
   },
   "description": {
     "en": "Layer showing playground equipment",
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index 419746490..ce46bce6c 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2763,7 +2763,7 @@
         "after": {
           "en": "Scan this code to open this location on another device",
           "nl": "Scan deze code om deze locatie op een ander apparaat te zien",
-          "de": "Scannen Sie den Code, um diesen Ort auf einem anderen Gerät zu öffnen",
+          "de": "QR Code scannen, um diesen Ort auf einem anderen Gerät zu öffnen",
           "sl": "Skenirajte to kodo, da odprete ta kraj na drugi napravi",
           "da": "Skan denne kode for at åbne dette sted på en anden enhed"
         }
diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index b8bde4971..e2e4eb522 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -9,7 +9,8 @@
     "it": "Riciclo",
     "pa_PK": "ریسائیکلنگ",
     "fr": "Recyclage",
-    "cs": "Recyklování"
+    "cs": "Recyklování",
+    "pl": "Recykling"
   },
   "description": {
     "en": "A layer with recycling containers and centres",
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index f8f97cd11..8e8116a31 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -11,7 +11,8 @@
     "ca": "Botiga",
     "es": "Tienda",
     "pa_PK": "دکان",
-    "cs": "Obchod"
+    "cs": "Obchod",
+    "pl": "Sklep"
   },
   "description": {
     "en": "A shop",
@@ -53,7 +54,8 @@
       "ca": "Botiga",
       "es": "Tienda",
       "pa_PK": "دکان",
-      "cs": "Obchod"
+      "cs": "Obchod",
+      "pl": "Sklep"
     },
     "mappings": [
       {
@@ -72,7 +74,8 @@
           "nl": "{name}",
           "ca": "{name}",
           "es": "{name}",
-          "cs": "{name}"
+          "cs": "{name}",
+          "pl": "{name}"
         }
       },
       {
@@ -325,7 +328,7 @@
           "if": "not:brand=yes",
           "then": {
             "en": "This shop does not have a specific brand, it is not part of a bigger chain",
-            "de": "Dieses Geschäft gehört zu keiner Marke oder Handelskette"
+            "de": "Das Geschäft gehört zu keiner Marke oder Handelskette"
           }
         }
       ]
diff --git a/assets/layers/trail/trail.json b/assets/layers/trail/trail.json
index 76ea39373..9c7c83bc4 100644
--- a/assets/layers/trail/trail.json
+++ b/assets/layers/trail/trail.json
@@ -8,7 +8,8 @@
     "fr": "Sentiers",
     "ca": "Camins",
     "da": "Stier",
-    "cs": "Stezky"
+    "cs": "Stezky",
+    "pl": "Ścieżki"
   },
   "description": {
     "en": "Waymarked trails",
@@ -40,7 +41,8 @@
       "fr": "Sentier",
       "ca": "Camí",
       "da": "Sti",
-      "cs": "Stezka"
+      "cs": "Stezka",
+      "pl": "Ścieżka"
     },
     "mappings": [
       {
diff --git a/assets/layers/tree_node/tree_node.json b/assets/layers/tree_node/tree_node.json
index da9f4fe11..1c7772b99 100644
--- a/assets/layers/tree_node/tree_node.json
+++ b/assets/layers/tree_node/tree_node.json
@@ -541,7 +541,8 @@
             "id": "Berdaun lebar",
             "da": "Bredbladet",
             "pt": "Folha larga",
-            "cs": "Listnatý"
+            "cs": "Listnatý",
+            "pl": "Szerokolistne"
           },
           "icon": {
             "path": "./assets/layers/tree_node/broadleaved.svg",
@@ -563,7 +564,8 @@
             "ca": "Amb fulles d'agulla",
             "es": "Hoja aguja",
             "id": "Berdaun jarum",
-            "cs": "Jehličnatý"
+            "cs": "Jehličnatý",
+            "pl": "Iglaste"
           },
           "icon": {
             "path": "./assets/layers/tree_node/needleleaved.svg",
diff --git a/assets/layers/veterinary/veterinary.json b/assets/layers/veterinary/veterinary.json
index e6b04bd08..0da22a88d 100644
--- a/assets/layers/veterinary/veterinary.json
+++ b/assets/layers/veterinary/veterinary.json
@@ -8,7 +8,8 @@
     "nl": "Dierenarts",
     "fr": "vétérinaire",
     "ca": "Veterinari",
-    "cs": "veterinář"
+    "cs": "veterinář",
+    "pl": "weterynaryjny"
   },
   "description": "A layer showing veterinarians",
   "source": {
@@ -28,7 +29,8 @@
       "es": "Veterinario",
       "nl": "Dierenarts",
       "ca": "Veterinari",
-      "cs": "Veterinární ordinace"
+      "cs": "Veterinární ordinace",
+      "pl": "Weterynaryjny"
     },
     "mappings": [
       {
diff --git a/assets/layers/visitor_information_centre/visitor_information_centre.json b/assets/layers/visitor_information_centre/visitor_information_centre.json
index 7ce0e5559..951ac4a28 100644
--- a/assets/layers/visitor_information_centre/visitor_information_centre.json
+++ b/assets/layers/visitor_information_centre/visitor_information_centre.json
@@ -44,7 +44,8 @@
       "es": "{name}",
       "da": "{name}",
       "cs": "{name}",
-      "zh_Hant": "{name}"
+      "zh_Hant": "{name}",
+      "pl": "{name}"
     },
     "mappings": [
       {
@@ -75,7 +76,8 @@
           "es": "{name}",
           "da": "{name}",
           "cs": "{name}",
-          "zh_Hant": "{name}"
+          "zh_Hant": "{name}",
+          "pl": "{name}"
         }
       }
     ]
diff --git a/assets/themes/fireplace/fireplace.json b/assets/themes/fireplace/fireplace.json
index 6e43de1d3..b863c6a74 100644
--- a/assets/themes/fireplace/fireplace.json
+++ b/assets/themes/fireplace/fireplace.json
@@ -7,7 +7,8 @@
   },
   "description": {
     "de": "Stelle im Freien zum Feuermachen oder ein ortsfest installierter Grill an einer offizielle Stelle.",
-    "en": "Outdoor place to make a fire or a fixed barbecue in an official place."
+    "en": "Outdoor place to make a fire or a fixed barbecue in an official place.",
+    "es": "Lugar al aire libre adecuado para hacer fuego y con barbacoas."
   },
   "icon": "./assets/layers/assembly_point/fire.svg",
   "layers": [
diff --git a/assets/themes/lighthouses/lighthouses.json b/assets/themes/lighthouses/lighthouses.json
index 51625bac2..1d3c9c2c6 100644
--- a/assets/themes/lighthouses/lighthouses.json
+++ b/assets/themes/lighthouses/lighthouses.json
@@ -4,12 +4,14 @@
     "en": "Lighthouses",
     "de": "Leuchttürme",
     "da": "Fyrtårne",
-    "it": "Fari"
+    "it": "Fari",
+    "es": "Faros"
   },
   "description": {
     "en": "Lighthouses are tall buildings with a light on top to guide marine traffic.",
     "de": "Leuchttürme sind hohe Gebäude mit einem Licht an der Spitze, das den Schiffsverkehr leitet.",
-    "it": "I fari sono edifici alti con una luce in cima per guidare il traffico marittimo."
+    "it": "I fari sono edifici alti con una luce in cima per guidare il traffico marittimo.",
+    "es": "Los faros son edificios altos con una luz en la parte superior para guiar el tráfico marítimo."
   },
   "icon": "./assets/themes/lighthouses/lighthouse.svg",
   "startLat": 51.33884,
diff --git a/assets/themes/memorials/memorials.json b/assets/themes/memorials/memorials.json
index b075165fc..88a536556 100644
--- a/assets/themes/memorials/memorials.json
+++ b/assets/themes/memorials/memorials.json
@@ -6,13 +6,15 @@
     "fr": "Mémoriaux",
     "nl": "Gedenktekens en graven",
     "da": "Mindesmærker",
-    "sl": "Spomeniki"
+    "sl": "Spomeniki",
+    "es": "Memoriales"
   },
   "description": {
     "en": "Memorials are physical objects permantently placed in the public space to remember a person or event. They can be a wide range of objects, such as statues, plaques, paintings, military objects (such as tanks), ...",
     "de": "Denkmäler sind physische Objekte, die dauerhaft im öffentlichen Raum aufgestellt werden, um an eine Person oder ein Ereignis zu erinnern. Dabei kann es sich um eine Vielzahl von Objekten handeln, z. B. Statuen, Tafeln, Gemälde, militärische Objekte (wie Panzer), ...",
     "fr": "Un mémorial est un objet physiquement installé sur l'espace public en souvenir d'une personne ou d'un évènement. Cela peut être toute sorte d'objets, comme une statue, une plaque, une peinture, un objet militaire (comme un tank), ...",
-    "nl": "Een gedenkteken is een fysiek object dat permanent in de publieke ruimte aanwezig is om een persoon of gebeurtenis te herdenken. Dit kan in diverse vormen, zoals standbeelden, naamborden, muurschilderingen, militaire objecten,..."
+    "nl": "Een gedenkteken is een fysiek object dat permanent in de publieke ruimte aanwezig is om een persoon of gebeurtenis te herdenken. Dit kan in diverse vormen, zoals standbeelden, naamborden, muurschilderingen, militaire objecten,...",
+    "es": "Los monumentos conmemorativos son objetos físicos colocados de forma permanente en el espacio público para recordar a una persona o un acontecimiento. Pueden ser objetos muy diversos, como estatuas, placas, pinturas, objetos militares (como tanques),..."
   },
   "icon": "./assets/layers/memorial/memorial.svg",
   "layers": [
diff --git a/assets/themes/openlovemap/openlovemap.json b/assets/themes/openlovemap/openlovemap.json
index d6003115e..869e3d830 100644
--- a/assets/themes/openlovemap/openlovemap.json
+++ b/assets/themes/openlovemap/openlovemap.json
@@ -52,7 +52,8 @@
             "multiAnswer": true,
             "question": {
               "en": "Does this shop offer fetish gear?",
-              "de": "Bietet dieser Laden Fetischkleidung an?"
+              "de": "Bietet dieser Laden Fetischkleidung an?",
+              "es": "¿Ofrece esta tienda artículos fetichistas?"
             },
             "mappings": [
               {
@@ -60,7 +61,8 @@
                 "ifnot": "fetish:bdsm:soft=no",
                 "then": {
                   "en": "This shop offers <b>soft BDSM-gear</b>, such as fluffy handcuffs, a 'fifty-shade-of-grey'-starterset, ...",
-                  "de": "Dieser Laden bietet <b>weiches BDSM-Zubehör</b> an, wie zum Beispiel flauschige Handschellen, ein \"Fifty Shades of Grey\"-Starterset, ..."
+                  "de": "Dieser Laden bietet <b>weiches BDSM-Zubehör</b> an, wie zum Beispiel flauschige Handschellen, ein \"Fifty Shades of Grey\"-Starterset, ...",
+                  "es": "Esta tienda ofrece <b>artículos BDSM suaves</b>, como esposas mullidas, un conjunto de ..."
                 }
               },
               {
@@ -68,7 +70,8 @@
                 "ifnot": "fetish:bdsm:specialized=no",
                 "then": {
                   "en": "This shop offers <b>specialized BDSM-gear</b>, such as spreader bars, supplies for needle play, medical bondage supplies, impact tools, shackles, metal colors, cuffs, nipple clamps, shibari accessories, ...",
-                  "de": "Dieser Laden bietet <b>spezialisiertes BDSM-Zubehör</b> an, wie zum Beispiel Spreizstangen, Utensilien für Nadelfolter, medizinische Bondage-Ausrüstung, Schlagwerkzeuge, Fesseln, Metallhalsbänder, Handschellen, Nippelklemmen, Shibari-Zubehör, ..."
+                  "de": "Dieser Laden bietet <b>spezialisiertes BDSM-Zubehör</b> an, wie zum Beispiel Spreizstangen, Utensilien für Nadelfolter, medizinische Bondage-Ausrüstung, Schlagwerkzeuge, Fesseln, Metallhalsbänder, Handschellen, Nippelklemmen, Shibari-Zubehör, ...",
+                  "es": "Esta tienda ofrece <b>artículos especializados en BDSM</b>, como barras separadoras, artículos para juegos con agujas, artículos de bondage médico, herramientas de impacto, grilletes, colores metálicos, esposas, pinzas para pezones, accesorios de shibari, ..."
                 }
               },
               {
@@ -76,7 +79,8 @@
                 "ifnot": "fetish:pet_play=no",
                 "then": {
                   "en": "This shop offers <b>pet play</b> accessories, such as puppy masks, animal masks, pony play, tails, hoof shoes, ...",
-                  "de": "Dieser Laden bietet <b>Petplay</b>-Zubehör an, wie zum Beispiel Hundemasken, Tiermasken, Ponyplay-Ausrüstung, Schwänze, Hufschuhe, ..."
+                  "de": "Dieser Laden bietet <b>Petplay</b>-Zubehör an, wie zum Beispiel Hundemasken, Tiermasken, Ponyplay-Ausrüstung, Schwänze, Hufschuhe, ...",
+                  "es": "Esta tienda ofrece <b>accesorios para mascotas</b>, como máscaras de cachorros, máscaras de animales, juegos de ponis, colas, herraduras..."
                 }
               },
               {
@@ -84,7 +88,8 @@
                 "ifnot": "fetish:leather=no",
                 "then": {
                   "en": "This shop offers <b>leather gear</b>, including pants and shirts usable in daily life up till leather harnesses",
-                  "de": "Dieser Laden bietet <b>Lederkleidung</b> an, darunter Hosen und Hemden für den Alltag bis hin zu Lederharnissen"
+                  "de": "Dieser Laden bietet <b>Lederkleidung</b> an, darunter Hosen und Hemden für den Alltag bis hin zu Lederharnissen",
+                  "es": "Esta tienda ofrece <b>ropa de cuero</b>, desde pantalones y camisas de uso diario hasta arneses de cuero"
                 }
               },
               {
@@ -92,7 +97,8 @@
                 "ifnot": "fetish:uniform=no",
                 "then": {
                   "en": "This shop offers <b>uniforms</b> for roleplay, such nurse uniforms, military uniforms, police, school girl, french maid, ...",
-                  "de": "Dieser Laden bietet <b>Uniformen</b> für Rollenspiele an, wie Krankenschwester-Uniformen, Militäruniformen, Polizei-, Schulmädchen- und Dienstmädchen-Outfits, ..."
+                  "de": "Dieser Laden bietet <b>Uniformen</b> für Rollenspiele an, wie Krankenschwester-Uniformen, Militäruniformen, Polizei-, Schulmädchen- und Dienstmädchen-Outfits, ...",
+                  "es": "Esta tienda ofrece <b>uniformes</b> para juegos de rol, tales como uniformes de enfermera, uniformes militares, policía, colegiala, criada francesa, ..."
                 }
               }
             ]
diff --git a/assets/themes/postboxes/postboxes.json b/assets/themes/postboxes/postboxes.json
index 163ed0d57..3af62a58e 100644
--- a/assets/themes/postboxes/postboxes.json
+++ b/assets/themes/postboxes/postboxes.json
@@ -62,7 +62,8 @@
         "minzoomVisible": 18,
         "description": {
           "en": "Add a new post partner to the map in an existing shop",
-          "de": "Hinzufügen eines neuen Post-Partners auf der Karte in einem bestehenden Geschäft"
+          "de": "Hinzufügen eines neuen Post-Partners auf der Karte in einem bestehenden Geschäft",
+          "es": "Agregar un nuevo punto de recogida al mapa en una tienda existente"
         },
         "+tagRenderings": [
           {
@@ -70,7 +71,8 @@
             "question": {
               "en": "Is this shop a post partner?",
               "de": "Ist dieses Geschäft ein Post-Partner?",
-              "nl": "Is deze winkel een post-partner?"
+              "nl": "Is deze winkel een post-partner?",
+              "es": "¿Es esta tienda un puesto de recogida de paquetes?"
             },
             "mappings": [
               {
@@ -78,7 +80,8 @@
                 "then": {
                   "en": "This shop is a post partner",
                   "de": "Dieses Geschäft ist ein Post-Partner",
-                  "nl": "Deze winkel is een post-partner"
+                  "nl": "Deze winkel is een post-partner",
+                  "es": "Esta tienda es colaboradora de correos o alguna agencia de transporte"
                 }
               },
               {
@@ -86,7 +89,8 @@
                 "then": {
                   "en": "This shop is not a post partner",
                   "de": "Dieses Geschäft ist kein Post-Partner",
-                  "nl": "Deze winkel is geen post-partner"
+                  "nl": "Deze winkel is geen post-partner",
+                  "es": "Esta tienda no está asociada a ninguna agencia de transporte"
                 }
               }
             ]
@@ -101,11 +105,13 @@
             ],
             "title": {
               "en": "a missing shop that is a post partner",
-              "de": "ein fehlendes Geschäft, das ein Post-Partner ist"
+              "de": "ein fehlendes Geschäft, das ein Post-Partner ist",
+              "es": "Una tienda desaparecida que era un punto de recogida de paquetes"
             },
             "description": {
               "en": "If a shop is not yet on the map and is a post partner, you can add it here.",
-              "de": "Wenn ein Laden noch nicht auf der Karte ist und ein Post-Partner ist, kannst du ihn hier hinzufügen."
+              "de": "Wenn ein Laden noch nicht auf der Karte ist und ein Post-Partner ist, kannst du ihn hier hinzufügen.",
+              "es": "Si una tienda aún no está en el mapa y es un puntode recogida de paquetes, puedes añadirla aquí."
             }
           }
         ]
diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json
index 52aed439c..bc0fcda60 100644
--- a/assets/themes/waste_basket/waste_basket.json
+++ b/assets/themes/waste_basket/waste_basket.json
@@ -18,16 +18,16 @@
     "pl": "Kosz na śmieci"
   },
   "description": {
-    "en": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself",
+    "en": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself.",
     "nl": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen",
-    "de": "Auf dieser Karte findest Du Abfalleimer in Deiner Nähe. Wenn ein Abfalleimer auf dieser Karte fehlt, kannst du ihn selbst hinzufügen",
+    "de": "Die Karte zeigt Abfalleimer in der Nähe. Wenn ein Abfalleimer fehlt, kannst du ihn selbst hinzufügen.",
     "it": "In questa cartina troverai i cestini dei rifiuti nei tuoi paraggi. Se manca un cestino, puoi inserirlo tu stesso",
     "zh_Hant": "在這份地圖當中，你可以找到你附近的垃圾筒。如果地圖有遺漏垃圾筒，你可以自己加上去",
     "hu": "Ezen a térképen megtalálhatod a közeledben lévő szemeteskosarakat. Ha hiányzik egy kuka a térképről, te is felrajzolhatod",
     "fr": "Retrouvez les poubelles près de vous. Si une poubelle est manquante, vous pouvez l’ajouter vous même",
     "da": "På dette kort finder du skraldespande i nærheden af dig. Hvis der mangler en skraldespand på dette kort, kan du selv tilføje den",
     "ca": "A aquest mapa trobaràs les papereres a prop teua. Si falta una paperera al mapa pots afegir-la tu mateix",
-    "es": "En este mapa, encontrará las papeleras cercanas a usted. Si falta una papelera en el mapa, puede añadirla usted mismo",
+    "es": "En este mapa, encontrarás las papeleras cercanas a ti. Si falta alguna en el mapa, puedes añadirla tu mismo.",
     "cs": "Na této mapě najdete koše na odpadky ve vašem okolí. Pokud na této mapě odpadkový koš chybí, můžete jej přidat sami",
     "pl": "Na tej mapie znajdziesz kosze na śmieci w twojej okolicy. Jeśli brakuje kosza, możesz go dodać"
   },
diff --git a/langs/cs.json b/langs/cs.json
index e5294a30c..121337b98 100644
--- a/langs/cs.json
+++ b/langs/cs.json
@@ -859,4 +859,4 @@
             "startsWithQ": "Identifikátor wikidat začíná písmenem Q a následuje za ním číslo"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/de.json b/langs/de.json
index 8f8d55f2e..bde05f4d0 100644
--- a/langs/de.json
+++ b/langs/de.json
@@ -864,4 +864,4 @@
             "startsWithQ": "Ein Wikidata-Identifikator beginnt mit Q und wird von einer Zahl gefolgt"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/en.json b/langs/en.json
index a0d602f60..f91adcd4a 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -864,4 +864,4 @@
             "startsWithQ": "A wikidata identifier starts with Q and is followed by a number"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/es.json b/langs/es.json
index 8526a6eb0..a749a08a7 100644
--- a/langs/es.json
+++ b/langs/es.json
@@ -592,4 +592,4 @@
             "description": "Un identificador de Wikidata"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index 2c202f2c1..eee2648ba 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -9655,4 +9655,4 @@
             "render": "větrná turbína"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 6e7bfa82a..5342bc42d 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -12232,4 +12232,4 @@
             "render": "Windrad"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index 7829c31d7..3a49eeb01 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -3707,4 +3707,4 @@
             "render": "turbina wiatrowa"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/sl.json b/langs/layers/sl.json
index ed88b41cc..d5f601a72 100644
--- a/langs/layers/sl.json
+++ b/langs/layers/sl.json
@@ -520,4 +520,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/nan.json b/langs/nan.json
index 087403e5c..4b97ab695 100644
--- a/langs/nan.json
+++ b/langs/nan.json
@@ -11,4 +11,4 @@
             "startsWithQ": "A wikidata identifier starts with Q and is followed by a number"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/sl.json b/langs/sl.json
index 1cdbd23fb..dff241b67 100644
--- a/langs/sl.json
+++ b/langs/sl.json
@@ -149,4 +149,4 @@
         "partOfRelation": "Ta element je del relacije. Premaknete ga lahko z drugim urejevalnikom.",
         "whyMove": "Zakaj želite premakniti ta element?"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/ca.json b/langs/themes/ca.json
index f37474778..74029e90c 100644
--- a/langs/themes/ca.json
+++ b/langs/themes/ca.json
@@ -1038,4 +1038,4 @@
         "shortDescription": "Un mapa amb papereres",
         "title": "Papepera"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/cs.json b/langs/themes/cs.json
index 893f914b2..40b54044a 100644
--- a/langs/themes/cs.json
+++ b/langs/themes/cs.json
@@ -1054,4 +1054,4 @@
         "shortDescription": "Mapa odpadkových košů",
         "title": "Odpadkový koš"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/da.json b/langs/themes/da.json
index ec2a068e7..f780a079f 100644
--- a/langs/themes/da.json
+++ b/langs/themes/da.json
@@ -846,4 +846,4 @@
         "shortDescription": "Et kort over skraldespande",
         "title": "Skraldespande"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 835f2bfe6..32859c519 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -1474,4 +1474,4 @@
         "shortDescription": "Eine Karte mit Abfalleimern",
         "title": "Abfalleimer"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 8b6e6f7fd..1af16943b 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -1474,4 +1474,4 @@
         "shortDescription": "A map with waste baskets",
         "title": "Waste Baskets"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/es.json b/langs/themes/es.json
index 0601fa87f..44b41914e 100644
--- a/langs/themes/es.json
+++ b/langs/themes/es.json
@@ -1474,4 +1474,4 @@
         "shortDescription": "Un mapa con papeleras",
         "title": "Papeleras"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index 0680da154..fdffc9531 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -1004,4 +1004,4 @@
         "shortDescription": "Une carte des poubelles",
         "title": "Poubelles"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/hu.json b/langs/themes/hu.json
index 507129f2b..48d58f1c0 100644
--- a/langs/themes/hu.json
+++ b/langs/themes/hu.json
@@ -388,4 +388,4 @@
         "shortDescription": "Szemeteskosarakat ábrázoló térkép",
         "title": "Kukatérkép"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/it.json b/langs/themes/it.json
index 7531f5ce3..9b0da466a 100644
--- a/langs/themes/it.json
+++ b/langs/themes/it.json
@@ -687,4 +687,4 @@
         "shortDescription": "Una cartina dei cestini dei rifiuti",
         "title": "Cestino dei rifiuti"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index fc5a94b00..177b20e8a 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -1158,4 +1158,4 @@
         "shortDescription": "Een kaart met vuilnisbakken",
         "title": "Vuilnisbakken"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/pl.json b/langs/themes/pl.json
index 8c37f2be7..e3be5755f 100644
--- a/langs/themes/pl.json
+++ b/langs/themes/pl.json
@@ -1019,4 +1019,4 @@
         "shortDescription": "Mapa koszy na śmieci",
         "title": "Kosz na śmieci"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json
index 6643da7eb..a76a102df 100644
--- a/langs/themes/zh_Hant.json
+++ b/langs/themes/zh_Hant.json
@@ -491,4 +491,4 @@
         "shortDescription": "垃圾筒的地圖",
         "title": "垃圾筒"
     }
-}
+}
\ No newline at end of file
diff --git a/src/UI/BigComponents/Filterview.svelte b/src/UI/BigComponents/Filterview.svelte
index e669b6d66..4adeca7a9 100644
--- a/src/UI/BigComponents/Filterview.svelte
+++ b/src/UI/BigComponents/Filterview.svelte
@@ -7,7 +7,6 @@
   import ToSvelte from "../Base/ToSvelte.svelte"
   import Checkbox from "../Base/Checkbox.svelte"
   import FilterConfig from "../../Models/ThemeConfig/FilterConfig"
-  import If from "../Base/If.svelte"
   import Dropdown from "../Base/Dropdown.svelte"
   import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource"
   import FilterviewWithFields from "./FilterviewWithFields.svelte"
diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte
index a8bcfb6c4..65dc61ccc 100644
--- a/src/UI/BigComponents/MenuDrawer.svelte
+++ b/src/UI/BigComponents/MenuDrawer.svelte
@@ -161,7 +161,7 @@
         <Tr t={t.showIntroduction} />
       </svelte:fragment>
       <svelte:fragment slot="header">
-        <Marker size="h-8 w-8 mr-3"  icons={layout.icon} />
+        <Marker size="h-8 w-8 mr-3" icons={layout.icon} />
         <Tr t={layout.title} />
       </svelte:fragment>
       <ThemeIntroPanel {state} />
diff --git a/src/assets/contributors.json b/src/assets/contributors.json
index 5145d9180..0f4cdb3b1 100644
--- a/src/assets/contributors.json
+++ b/src/assets/contributors.json
@@ -1,7 +1,7 @@
 {
   "contributors": [
     {
-      "commits": 8118,
+      "commits": 8127,
       "contributor": "Pieter Vander Vennet"
     },
     {
diff --git a/src/assets/language_in_country.json b/src/assets/language_in_country.json
index 66cf91a39..d1d1063a8 100644
--- a/src/assets/language_in_country.json
+++ b/src/assets/language_in_country.json
@@ -503,6 +503,7 @@
     "pl"
   ],
   "PS": [
+    "ar",
     "ar"
   ],
   "PT": [
diff --git a/src/assets/translators.json b/src/assets/translators.json
index 44083f58f..b493b98ae 100644
--- a/src/assets/translators.json
+++ b/src/assets/translators.json
@@ -1,11 +1,11 @@
 {
   "contributors": [
     {
-      "commits": 478,
+      "commits": 479,
       "contributor": "Pieter Vander Vennet"
     },
     {
-      "commits": 368,
+      "commits": 385,
       "contributor": "kjon"
     },
     {
@@ -36,6 +36,10 @@
       "commits": 44,
       "contributor": "Supaplex"
     },
+    {
+      "commits": 36,
+      "contributor": "Jiří Podhorecký"
+    },
     {
       "commits": 36,
       "contributor": "Lucas"
@@ -45,17 +49,13 @@
       "contributor": "Iago"
     },
     {
-      "commits": 34,
-      "contributor": "Jiří Podhorecký"
+      "commits": 33,
+      "contributor": "gallegonovato"
     },
     {
       "commits": 32,
       "contributor": "Babos Gábor"
     },
-    {
-      "commits": 30,
-      "contributor": "gallegonovato"
-    },
     {
       "commits": 29,
       "contributor": "Artem"
@@ -70,11 +70,11 @@
     },
     {
       "commits": 23,
-      "contributor": "Marco"
+      "contributor": "Štefan Baebler"
     },
     {
-      "commits": 21,
-      "contributor": "Štefan Baebler"
+      "commits": 23,
+      "contributor": "Marco"
     },
     {
       "commits": 18,
@@ -168,6 +168,10 @@
       "commits": 10,
       "contributor": "Irina"
     },
+    {
+      "commits": 9,
+      "contributor": "Krzysztof Chorzempa"
+    },
     {
       "commits": 9,
       "contributor": "Lasse Liehu"
@@ -196,10 +200,6 @@
       "commits": 8,
       "contributor": "nilocram"
     },
-    {
-      "commits": 8,
-      "contributor": "Krzysztof Chorzempa"
-    },
     {
       "commits": 8,
       "contributor": "Vinicius"
@@ -328,6 +328,10 @@
       "commits": 4,
       "contributor": "Jan Zabel"
     },
+    {
+      "commits": 3,
+      "contributor": "Thomas"
+    },
     {
       "commits": 3,
       "contributor": "Paolo Mauri"
@@ -400,10 +404,6 @@
       "commits": 3,
       "contributor": "SiegbjornSitumeang"
     },
-    {
-      "commits": 2,
-      "contributor": "Thomas"
-    },
     {
       "commits": 2,
       "contributor": "Beardhatcode"
@@ -524,6 +524,10 @@
       "commits": 2,
       "contributor": "Leo Alcaraz"
     },
+    {
+      "commits": 1,
+      "contributor": "tiptoptom"
+    },
     {
       "commits": 1,
       "contributor": "aTarom"

From 4af23b1d8fe5331877c23c4e52484479b0788877 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Wed, 11 Sep 2024 15:54:43 +0200
Subject: [PATCH 9/9] Chore: housekeeping

---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76959decf..afe2d8bf6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7894,9 +7894,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001655",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-      "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+      "version": "1.0.30001660",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
+      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
       "dev": true,
       "funding": [
         {
@@ -25255,9 +25255,9 @@
       "version": "2.0.1"
     },
     "caniuse-lite": {
-      "version": "1.0.30001655",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
-      "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
+      "version": "1.0.30001660",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz",
+      "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==",
       "dev": true
     },
     "canonicalize": {