Chore: formatting

Docs/BuiltinQuestions.md

@@ -108,8 +108,8 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | ["by appointment"](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D"by appointment")
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/service:electricity#values) [service:electricity](https://wiki.openstreetmap.org/wiki/Key:service:electricity) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dyes) [limited](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dlimited) [ask](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dask) [no](https://wiki.openstreetmap.org/wiki/Tag:service:electricity%3Dno)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [level](https://wiki.openstreetmap.org/wiki/Key:level) | [string](../SpecialInputElements.md#string) | [0](https://wiki.openstreetmap.org/wiki/Tag:level%3D0) [1](https://wiki.openstreetmap.org/wiki/Tag:level%3D1) [-1](https://wiki.openstreetmap.org/wiki/Tag:level%3D-1)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [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)
@@ -293,13 +293,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -543,9 +543,16 @@ The question is  *What coins can you use to pay here?*
   - *50 cent coins are accepted*  corresponds with  `payment:coins:denominations=0.50 EUR`
   - *1 euro coins are accepted*  corresponds with  `payment:coins:denominations=1 EUR`
   - *2 euro coins are accepted*  corresponds with  `payment:coins:denominations=2 EUR`
+  - *5 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.05 CHF`
+  - *10 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.10 CHF`
+  - *20 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.20 CHF`
+  - *½ franc coins are accepted*  corresponds with  `payment:coins:denominations=0.50 CHF`
+  - *1 franc coins are accepted*  corresponds with  `payment:coins:denominations=1 CHF`
+  - *2 francs coins are accepted*  corresponds with  `payment:coins:denominations=2 CHF`
+  - *5 francs coins are accepted*  corresponds with  `payment:coins:denominations=5 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 
@@ -566,9 +573,15 @@ The question is  *what notes can you use to pay here?*
   - *100 euro notes are accepted*  corresponds with  `payment:notes:denominations=100 EUR`
   - *200 euro notes are accepted*  corresponds with  `payment:notes:denominations=200 EUR`
   - *500 euro notes are accepted*  corresponds with  `payment:notes:denominations=500 EUR`
+  - *10 francs notes are accepted*  corresponds with  `payment:notes:denominations=10 CHF`
+  - *20 francs notes are accepted*  corresponds with  `payment:notes:denominations=20 CHF`
+  - *50 francs notes are accepted*  corresponds with  `payment:notes:denominations=50 CHF`
+  - *100 francs notes are accepted*  corresponds with  `payment:notes:denominations=100 CHF`
+  - *200 francs notes are accepted*  corresponds with  `payment:notes:denominations=200 CHF`
+  - *1000 francs notes are accepted*  corresponds with  `payment:notes:denominations=1000 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 

Docs/Layers/all_vending_machine.md

@@ -49,8 +49,8 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [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)
@@ -193,9 +193,16 @@ The question is  *What coins can you use to pay here?*
   - *50 cent coins are accepted*  corresponds with  `payment:coins:denominations=0.50 EUR`
   - *1 euro coins are accepted*  corresponds with  `payment:coins:denominations=1 EUR`
   - *2 euro coins are accepted*  corresponds with  `payment:coins:denominations=2 EUR`
+  - *5 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.05 CHF`
+  - *10 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.10 CHF`
+  - *20 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.20 CHF`
+  - *½ franc coins are accepted*  corresponds with  `payment:coins:denominations=0.50 CHF`
+  - *1 franc coins are accepted*  corresponds with  `payment:coins:denominations=1 CHF`
+  - *2 francs coins are accepted*  corresponds with  `payment:coins:denominations=2 CHF`
+  - *5 francs coins are accepted*  corresponds with  `payment:coins:denominations=5 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 
@@ -216,9 +223,15 @@ The question is  *what notes can you use to pay here?*
   - *100 euro notes are accepted*  corresponds with  `payment:notes:denominations=100 EUR`
   - *200 euro notes are accepted*  corresponds with  `payment:notes:denominations=200 EUR`
   - *500 euro notes are accepted*  corresponds with  `payment:notes:denominations=500 EUR`
+  - *10 francs notes are accepted*  corresponds with  `payment:notes:denominations=10 CHF`
+  - *20 francs notes are accepted*  corresponds with  `payment:notes:denominations=20 CHF`
+  - *50 francs notes are accepted*  corresponds with  `payment:notes:denominations=50 CHF`
+  - *100 francs notes are accepted*  corresponds with  `payment:notes:denominations=100 CHF`
+  - *200 francs notes are accepted*  corresponds with  `payment:notes:denominations=200 CHF`
+  - *1000 francs notes are accepted*  corresponds with  `payment:notes:denominations=1000 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 

Docs/Layers/artwork.md

@@ -171,7 +171,7 @@ The question is  *Is there a website with more information about this artwork?*
 
 This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
 
-This is rendered with  `More information on <a href='{website}' target='_blank'>this website</a>`
+This is rendered with  `{link(More information on this website,&LBRACEwebsite&RBRACE,,)}`
 
 
 
@@ -502,7 +502,7 @@ This tagrendering has no question and is thus read-only
 id | question | osmTags
 ---- | ---------- | ---------
 has_image.0 | With and without images (default) | 
-has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.1 | Has at least one image | image~.+\|image:0~.+\|image:1~.+\|image:2~.+\|image:3~.+\|mapillary~.+
 has_image.2 | Probably does not have an image | 
  
 

Docs/Layers/bench.md

@@ -367,7 +367,7 @@ The question is  *Is there a website with more information about this artwork?*
 
 This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
 
-This is rendered with  `More information on <a href='{website}' target='_blank'>this website</a>`
+This is rendered with  `{link(More information on this website,&LBRACEwebsite&RBRACE,,)}`
 
 
 
@@ -486,7 +486,7 @@ has_backrest.2 | Has no backrest | backrest=no
 id | question | osmTags
 ---- | ---------- | ---------
 has_image.0 | With and without images (default) | 
-has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.1 | Has at least one image | image~.+\|image:0~.+\|image:1~.+\|image:2~.+\|image:3~.+\|mapillary~.+
 has_image.2 | Probably does not have an image | 
  
 

Docs/Layers/bicycle_library.md

@@ -157,13 +157,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/bicycle_rental.md

@@ -147,13 +147,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/bicycle_rental_non_docking.md

@@ -145,13 +145,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/bike_cafe.md

@@ -204,13 +204,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/bike_shop.md

@@ -189,13 +189,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/bike_themed_object.md

@@ -131,13 +131,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/birdhide.md

@@ -216,7 +216,7 @@ This tagrendering has no question and is thus read-only
 
 id | question | osmTags
 ---- | ---------- | ---------
-wheelchair.0 | Wheelchair accessible | wheelchair=yes\|wheelchair=designated|wheelchair=permissive
+wheelchair.0 | Wheelchair accessible | wheelchair=yes\|wheelchair=designated\|wheelchair=permissive
 
 
 

Docs/Layers/cafe_pub.md

@@ -200,13 +200,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/car_rental.md

@@ -124,13 +124,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/climbing.md

@@ -79,7 +79,7 @@ The question is  *Is there a (unofficial) website with more informations (e.g. t
 
 This rendering asks information about the property  [url](https://wiki.openstreetmap.org/wiki/Key:url) 
 
-This is rendered with  `<a href='{url}' target='_blank'>{url}</a>`
+This is rendered with  `<a href='{url}' target='_blank' rel='noopener'>{url}</a>`
 
 
 

Docs/Layers/climbing_area.md

@@ -196,7 +196,7 @@ The question is  *Is there a (unofficial) website with more informations (e.g. t
 
 This rendering asks information about the property  [url](https://wiki.openstreetmap.org/wiki/Key:url) 
 
-This is rendered with  `<a href='{url}' target='_blank'>{url}</a>`
+This is rendered with  `<a href='{url}' target='_blank' rel='noopener'>{url}</a>`
 
 
 

Docs/Layers/climbing_club.md

@@ -119,13 +119,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/climbing_gym.md

@@ -168,13 +168,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/defibrillator.md

@@ -425,7 +425,7 @@ This tagrendering has no question and is thus read-only
 id | question | osmTags
 ---- | ---------- | ---------
 has_image.0 | With and without images (default) | 
-has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.1 | Has at least one image | image~.+\|image:0~.+\|image:1~.+\|image:2~.+\|image:3~.+\|mapillary~.+
 has_image.2 | Probably does not have an image | 
 
 

Docs/Layers/dentist.md

@@ -131,13 +131,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/doctors.md

@@ -154,13 +154,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/dogfoodb.md

@@ -206,13 +206,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -720,7 +720,7 @@ open_now.0 | Open now | _isOpen=yes
 
 id | question | osmTags
 ---- | ---------- | ---------
-reservation.0 | Reservation not required | reservation=no\|reservation=optional|
+reservation.0 | Reservation not required | reservation=no\|reservation=optional\|
 
 
 
@@ -736,7 +736,7 @@ food-category.2 | Only restaurants | amenity=restaurant
 
 id | question | osmTags
 ---- | ---------- | ---------
-vegetarian.0 | Has a vegan menu | diet:vegetarian=yes\|diet:vegetarian=only|diet:vegan=yes|diet:vegan=only
+vegetarian.0 | Has a vegan menu | diet:vegetarian=yes\|diet:vegetarian=only\|diet:vegan=yes\|diet:vegan=only
 
 
 

Docs/Layers/dogshop.md

@@ -328,13 +328,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/drinking_water.md

@@ -27,6 +27,7 @@ A layer showing drinking water fountains
 
 
 
+  - [climbing](https://mapcomplete.org/climbing)
   - [cyclofix](https://mapcomplete.org/cyclofix)
   - [drinking_water](https://mapcomplete.org/drinking_water)
   - [nature](https://mapcomplete.org/nature)

Docs/Layers/elevator.md

@@ -55,6 +55,8 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/elevator:width#values) [elevator:width](https://wiki.openstreetmap.org/wiki/Key:elevator:width) | [pfloat](../SpecialInputElements.md#pfloat) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/elevator:depth#values) [elevator:depth](https://wiki.openstreetmap.org/wiki/Key:elevator:depth) | [pfloat](../SpecialInputElements.md#pfloat) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/hearing_loop#values) [hearing_loop](https://wiki.openstreetmap.org/wiki/Key:hearing_loop) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:hearing_loop%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:hearing_loop%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/tactile_writing:braille#values) [tactile_writing:braille](https://wiki.openstreetmap.org/wiki/Key:tactile_writing:braille) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:tactile_writing:braille%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:tactile_writing:braille%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/speech_output#values) [speech_output](https://wiki.openstreetmap.org/wiki/Key:speech_output) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:speech_output%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:speech_output%3Dno)
 
 
 
@@ -194,6 +196,22 @@ The question is  *Does this place have an audio induction loop for people with r
 
 
 
+### tactile_writing_available 
+
+
+
+The question is  *Has this elevator tactile writing?*
+
+
+
+
+
+  - *This elevator has tactile writing in Braille*  corresponds with  `tactile_writing:braille=yes`
+  - *This elevator does not have tactile writing*  corresponds with  `tactile_writing:braille=no`
+
+
+
+
 ### tactile_writing_language 
 
 
@@ -202,6 +220,24 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `tactile_writing:braille=yes`
+
+
+
+### speech_output_available 
+
+
+
+The question is  *Has this elevator speech output?*
+
+
+
+
+
+  - *This elevator has speech output*  corresponds with  `speech_output=yes`
+  - *This elevator does not have speech output*  corresponds with  `speech_output=no`
+
+
 
 
 ### speech_output 
@@ -212,6 +248,8 @@ This tagrendering has no question and is thus read-only
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `speech_output=yes`
+
 
 
 ### leftover-questions 

Docs/Layers/elongated_coin.md

@@ -50,10 +50,11 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/coin:design_count#values) [coin:design_count](https://wiki.openstreetmap.org/wiki/Key:coin:design_count) | [pnat](../SpecialInputElements.md#pnat) | [1](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D1) [2](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D2) [3](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D3) [4](https://wiki.openstreetmap.org/wiki/Tag:coin:design_count%3D4)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/coin:type#values) [coin:type](https://wiki.openstreetmap.org/wiki/Key:coin:type) | [string](../SpecialInputElements.md#string) | [2cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D2cent) [5cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D5cent) [10cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D10cent) [25cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D25cent) [50cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D50cent)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/fee#values) [fee](https://wiki.openstreetmap.org/wiki/Key:fee) | Multiple choice | [](https://wiki.openstreetmap.org/wiki/Tag:fee%3D) [yes](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/coin:type#values) [coin:type](https://wiki.openstreetmap.org/wiki/Key:coin:type) | [string](../SpecialInputElements.md#string) | [2cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D2cent) [5cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D5cent) [10cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D10cent) [25cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D25cent) [50cent](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D50cent) [10centimes](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D10centimes) [20centimes](https://wiki.openstreetmap.org/wiki/Tag:coin:type%3D20centimes)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/website#values) [website](https://wiki.openstreetmap.org/wiki/Key:website) | [url](../SpecialInputElements.md#url) | 
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:charge%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:charge%3D2 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/charge#values) [charge](https://wiki.openstreetmap.org/wiki/Key:charge) | [string](../SpecialInputElements.md#string) | [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:charge%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:charge%3D2 EUR) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:charge%3D2 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:charge%3D1 CHF)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [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)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/check_date#values) [check_date](https://wiki.openstreetmap.org/wiki/Key:check_date) | [date](../SpecialInputElements.md#date) | [](https://wiki.openstreetmap.org/wiki/Tag:check_date%3D)
@@ -133,6 +134,23 @@ This is rendered with  `This penny press has {coin:design_count} designs availab
 
 
 
+### fee 
+
+
+
+The question is  *Does it cost money to press a penny?*
+
+
+
+
+
+  - *It costs money to press a penny.*  corresponds with  ``
+  - *It costs money to press a penny.*  corresponds with  `fee=yes`
+  - *It is free to press a penny.*  corresponds with  `fee=no`
+
+
+
+
 ### payment-options-split 
 
 
@@ -182,6 +200,8 @@ This is rendered with  `This penny press uses a {coin:type} coin for pressing.`
   - *This penny press uses a 10 cent coin for pressing.*  corresponds with  `coin:type=10cent`
   - *This penny press uses a 25 cent coin for pressing.*  corresponds with  `coin:type=25cent`
   - *This penny press uses a 50 cent coin for pressing.*  corresponds with  `coin:type=50cent`
+  - *This penny press uses a 10 centimes coin for pressing.*  corresponds with  `coin:type=10centimes`
+  - *This penny press uses a 20 centimes coin for pressing.*  corresponds with  `coin:type=20centimes`
 
 
 
@@ -224,6 +244,8 @@ This is rendered with  `It costs {charge} to press a penny.`
 
   - *It costs 1 euro to press a penny.*  corresponds with  `charge=1 EUR`
   - *It costs 2 euros to press a penny.*  corresponds with  `charge=2 EUR`
+  - *It costs 2 Swiss francs to press a penny.*  corresponds with  `charge=2 CHF`
+  - *It costs 1 Swiss franc to press a penny.*  corresponds with  `charge=1 CHF`
 
 
 
@@ -246,9 +268,16 @@ The question is  *What coins can you use to pay here?*
   - *50 cent coins are accepted*  corresponds with  `payment:coins:denominations=0.50 EUR`
   - *1 euro coins are accepted*  corresponds with  `payment:coins:denominations=1 EUR`
   - *2 euro coins are accepted*  corresponds with  `payment:coins:denominations=2 EUR`
+  - *5 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.05 CHF`
+  - *10 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.10 CHF`
+  - *20 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.20 CHF`
+  - *½ franc coins are accepted*  corresponds with  `payment:coins:denominations=0.50 CHF`
+  - *1 franc coins are accepted*  corresponds with  `payment:coins:denominations=1 CHF`
+  - *2 francs coins are accepted*  corresponds with  `payment:coins:denominations=2 CHF`
+  - *5 francs coins are accepted*  corresponds with  `payment:coins:denominations=5 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 

Docs/Layers/fitness_centre.md

@@ -138,13 +138,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/food.md

@@ -210,13 +210,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -724,7 +724,7 @@ open_now.0 | Open now | _isOpen=yes
 
 id | question | osmTags
 ---- | ---------- | ---------
-reservation.0 | Reservation not required | reservation=no\|reservation=optional|
+reservation.0 | Reservation not required | reservation=no\|reservation=optional\|
 
 
 
@@ -740,7 +740,7 @@ food-category.2 | Only restaurants | amenity=restaurant
 
 id | question | osmTags
 ---- | ---------- | ---------
-vegetarian.0 | Has a vegan menu | diet:vegetarian=yes\|diet:vegetarian=only|diet:vegan=yes|diet:vegan=only
+vegetarian.0 | Has a vegan menu | diet:vegetarian=yes\|diet:vegetarian=only\|diet:vegan=yes\|diet:vegan=only
 
 
 

Docs/Layers/friture.md

@@ -206,13 +206,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -720,7 +720,7 @@ open_now.0 | Open now | _isOpen=yes
 
 id | question | osmTags
 ---- | ---------- | ---------
-reservation.0 | Reservation not required | reservation=no\|reservation=optional|
+reservation.0 | Reservation not required | reservation=no\|reservation=optional\|
 
 
 
@@ -736,7 +736,7 @@ food-category.2 | Only restaurants | amenity=restaurant
 
 id | question | osmTags
 ---- | ---------- | ---------
-vegetarian.0 | Has a vegan menu | diet:vegetarian=yes\|diet:vegetarian=only|diet:vegan=yes|diet:vegan=only
+vegetarian.0 | Has a vegan menu | diet:vegetarian=yes\|diet:vegetarian=only\|diet:vegan=yes\|diet:vegan=only
 
 
 

Docs/Layers/ghost_bike.md

@@ -125,7 +125,7 @@ The question is  *On what webpage can one find more info about the ghost bike or
 
 This rendering asks information about the property  [source](https://wiki.openstreetmap.org/wiki/Key:source) 
 
-This is rendered with  `<a href='{source}' target='_blank'>More info available</a>`
+This is rendered with  `{link(More info available,&LBRACEsource&RBRACE,,)}`
 
 
 

Docs/Layers/governments.md

@@ -116,13 +116,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/hackerspace.md

@@ -181,13 +181,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/hospital.md

@@ -137,13 +137,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/hotel.md

@@ -147,13 +147,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/kindergarten_childcare.md

@@ -137,13 +137,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/medical-shops.md

@@ -328,13 +328,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/nature_reserve.md

@@ -221,7 +221,7 @@ The question is  *What email adress can one send to with questions and problems
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
@@ -235,7 +235,7 @@ The question is  *What phone number can one call to with questions and problems
 
 This rendering asks information about the property  [phone](https://wiki.openstreetmap.org/wiki/Key:phone) 
 
-This is rendered with  `<a href='tel:{phone}' target='_blank'>{phone}</a>`
+This is rendered with  `<a href='tel:{phone}' target='_blank' rel='noopener'>{phone}</a>`
 
 
 

Docs/Layers/parking_ticket_machine.md

@@ -48,8 +48,8 @@ this quick overview is incomplete
 attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/ref#values) [ref](https://wiki.openstreetmap.org/wiki/Key:ref) | [string](../SpecialInputElements.md#string) | 
 
 
@@ -134,9 +134,16 @@ The question is  *What coins can you use to pay here?*
   - *50 cent coins are accepted*  corresponds with  `payment:coins:denominations=0.50 EUR`
   - *1 euro coins are accepted*  corresponds with  `payment:coins:denominations=1 EUR`
   - *2 euro coins are accepted*  corresponds with  `payment:coins:denominations=2 EUR`
+  - *5 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.05 CHF`
+  - *10 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.10 CHF`
+  - *20 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.20 CHF`
+  - *½ franc coins are accepted*  corresponds with  `payment:coins:denominations=0.50 CHF`
+  - *1 franc coins are accepted*  corresponds with  `payment:coins:denominations=1 CHF`
+  - *2 francs coins are accepted*  corresponds with  `payment:coins:denominations=2 CHF`
+  - *5 francs coins are accepted*  corresponds with  `payment:coins:denominations=5 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 
@@ -157,9 +164,15 @@ The question is  *what notes can you use to pay here?*
   - *100 euro notes are accepted*  corresponds with  `payment:notes:denominations=100 EUR`
   - *200 euro notes are accepted*  corresponds with  `payment:notes:denominations=200 EUR`
   - *500 euro notes are accepted*  corresponds with  `payment:notes:denominations=500 EUR`
+  - *10 francs notes are accepted*  corresponds with  `payment:notes:denominations=10 CHF`
+  - *20 francs notes are accepted*  corresponds with  `payment:notes:denominations=20 CHF`
+  - *50 francs notes are accepted*  corresponds with  `payment:notes:denominations=50 CHF`
+  - *100 francs notes are accepted*  corresponds with  `payment:notes:denominations=100 CHF`
+  - *200 francs notes are accepted*  corresponds with  `payment:notes:denominations=200 CHF`
+  - *1000 francs notes are accepted*  corresponds with  `payment:notes:denominations=1000 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 

Docs/Layers/pharmacy.md

@@ -148,13 +148,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/physiotherapist.md

@@ -152,13 +152,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/public_bookcase.md

@@ -258,7 +258,7 @@ The question is  *Is there a website with more information about this public boo
 
 This rendering asks information about the property  [website](https://wiki.openstreetmap.org/wiki/Key:website) 
 
-This is rendered with  `More info on <a href='{website}' target='_blank'>the website</a>`
+This is rendered with  `{link(More info on the website,&LBRACEwebsite&RBRACE,,)}`
 
 
 
@@ -362,7 +362,7 @@ inside.2 | Located outdoors | indoor=no\|
 id | question | osmTags
 ---- | ---------- | ---------
 has_image.0 | With and without images (default) | 
-has_image.1 | Has at least one image | image~.+\|image:0~.+|image:1~.+|image:2~.+|image:3~.+|mapillary~.+
+has_image.1 | Has at least one image | image~.+\|image:0~.+\|image:1~.+\|image:2~.+\|image:3~.+\|mapillary~.+
 has_image.2 | Probably does not have an image | 
  
 

Docs/Layers/recycling.md

@@ -262,13 +262,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/school.md

@@ -229,13 +229,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/shops.md

@@ -333,13 +333,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/shower.md

@@ -299,7 +299,7 @@ This tagrendering has no question and is thus read-only
 
 id | question | osmTags
 ---- | ---------- | ---------
-free.0 | Free to use | fee=no\|fee=0|charge=0
+free.0 | Free to use | fee=no\|fee=0\|charge=0
 
 
 

Docs/Layers/sport_pitch.md

@@ -219,7 +219,7 @@ The question is  *What is the email address of the operator?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
@@ -314,7 +314,7 @@ This tagrendering has no question and is thus read-only
 
 id | question | osmTags
 ---- | ---------- | ---------
-accessibility.0 | Publicly accessible | access=yes\|access=public|
+accessibility.0 | Publicly accessible | access=yes\|access=public\|
 
 
 

Docs/Layers/sport_shops.md

@@ -328,13 +328,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/sports_centre.md

@@ -153,13 +153,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/tertiary_education.md

@@ -174,13 +174,13 @@ The question is  *What is the email address of {title()}?*
 
 This rendering asks information about the property  [email](https://wiki.openstreetmap.org/wiki/Key:email) 
 
-This is rendered with  `<a href='mailto:{email}' target='_blank'>{email}</a>`
+This is rendered with  `<a href='mailto:{email}' target='_blank' rel='noopener'>{email}</a>`
 
 
 
 
 
-  - *<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>*  corresponds with  `contact:email~.+`
+  - *<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>*  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 

Docs/Layers/ticket_machine.md

@@ -49,8 +49,8 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [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)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | [Nederlandse Spoorwegen](https://wiki.openstreetmap.org/wiki/Tag:operator%3DNederlandse Spoorwegen)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF)
 
 
 
@@ -178,9 +178,16 @@ The question is  *What coins can you use to pay here?*
   - *50 cent coins are accepted*  corresponds with  `payment:coins:denominations=0.50 EUR`
   - *1 euro coins are accepted*  corresponds with  `payment:coins:denominations=1 EUR`
   - *2 euro coins are accepted*  corresponds with  `payment:coins:denominations=2 EUR`
+  - *5 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.05 CHF`
+  - *10 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.10 CHF`
+  - *20 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.20 CHF`
+  - *½ franc coins are accepted*  corresponds with  `payment:coins:denominations=0.50 CHF`
+  - *1 franc coins are accepted*  corresponds with  `payment:coins:denominations=1 CHF`
+  - *2 francs coins are accepted*  corresponds with  `payment:coins:denominations=2 CHF`
+  - *5 francs coins are accepted*  corresponds with  `payment:coins:denominations=5 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 
@@ -201,9 +208,15 @@ The question is  *what notes can you use to pay here?*
   - *100 euro notes are accepted*  corresponds with  `payment:notes:denominations=100 EUR`
   - *200 euro notes are accepted*  corresponds with  `payment:notes:denominations=200 EUR`
   - *500 euro notes are accepted*  corresponds with  `payment:notes:denominations=500 EUR`
+  - *10 francs notes are accepted*  corresponds with  `payment:notes:denominations=10 CHF`
+  - *20 francs notes are accepted*  corresponds with  `payment:notes:denominations=20 CHF`
+  - *50 francs notes are accepted*  corresponds with  `payment:notes:denominations=50 CHF`
+  - *100 francs notes are accepted*  corresponds with  `payment:notes:denominations=100 CHF`
+  - *200 francs notes are accepted*  corresponds with  `payment:notes:denominations=200 CHF`
+  - *1000 francs notes are accepted*  corresponds with  `payment:notes:denominations=1000 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 

Docs/Layers/toilet.md

@@ -25,6 +25,7 @@ A layer showing (public) toilets
 
 
 
+  - [climbing](https://mapcomplete.org/climbing)
   - [nature](https://mapcomplete.org/nature)
   - [onwheels](https://mapcomplete.org/onwheels)
   - [personal](https://mapcomplete.org/personal)
@@ -454,7 +455,7 @@ changing_table.0 | Has a changing table | changing_table=yes
 
 id | question | osmTags
 ---- | ---------- | ---------
-free.0 | Free to use | fee=no\|fee=0|charge=0
+free.0 | Free to use | fee=no\|fee=0\|charge=0
 
 
 

Docs/Layers/toilet_at_amenity.md

@@ -405,7 +405,7 @@ changing_table.0 | Has a changing table | changing_table=yes
 
 id | question | osmTags
 ---- | ---------- | ---------
-free.0 | Free to use | toilets:fee=no\|toilets:fee=0|toilets:charge=0
+free.0 | Free to use | toilets:fee=no\|toilets:fee=0\|toilets:charge=0
 
 
 

Docs/Layers/vending_machine.md

@@ -49,8 +49,8 @@ attribute | type | values which are supported by this layer
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/id#values) [id](https://wiki.openstreetmap.org/wiki/Key:id) | Multiple choice | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/vending#values) [vending](https://wiki.openstreetmap.org/wiki/Key:vending) | [string](../SpecialInputElements.md#string) | [drinks](https://wiki.openstreetmap.org/wiki/Tag:vending%3Ddrinks) [sweets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dsweets) [food](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dfood) [cigarettes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcigarettes) [condoms](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcondoms) [coffee](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcoffee) [water](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dwater) [newspapers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dnewspapers) [bicycle_tube](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbicycle_tube) [milk](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dmilk) [bread](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dbread) [eggs](https://wiki.openstreetmap.org/wiki/Tag:vending%3Deggs) [cheese](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dcheese) [honey](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dhoney) [potatoes](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpotatoes) [flowers](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dflowers) [parking_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dparking_tickets) [elongated_coin](https://wiki.openstreetmap.org/wiki/Tag:vending%3Delongated_coin) [public_transport_tickets](https://wiki.openstreetmap.org/wiki/Tag:vending%3Dpublic_transport_tickets)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/opening_hours#values) [opening_hours](https://wiki.openstreetmap.org/wiki/Key:opening_hours) | [opening_hours](../SpecialInputElements.md#opening_hours) | [24/7](https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:coins:denominations#values) [payment:coins:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:coins:denominations) | Multiple choice | [0.01 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.01 EUR) [0.02 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.02 EUR) [0.05 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 EUR) [0.10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 EUR) [0.20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 EUR) [0.50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 EUR) [1 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 EUR) [2 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 EUR) [0.05 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.05 CHF) [0.10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.10 CHF) [0.20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.20 CHF) [0.50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D0.50 CHF) [1 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D1 CHF) [2 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D2 CHF) [5 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:coins:denominations%3D5 CHF)
-[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR)
+[<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/payment:notes:denominations#values) [payment:notes:denominations](https://wiki.openstreetmap.org/wiki/Key:payment:notes:denominations) | Multiple choice | [5 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D5 EUR) [10 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 EUR) [20 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 EUR) [50 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 EUR) [100 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 EUR) [200 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 EUR) [500 EUR](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D500 EUR) [10 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D10 CHF) [20 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D20 CHF) [50 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D50 CHF) [100 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D100 CHF) [200 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D200 CHF) [1000 CHF](https://wiki.openstreetmap.org/wiki/Tag:payment:notes:denominations%3D1000 CHF)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/operator#values) [operator](https://wiki.openstreetmap.org/wiki/Key:operator) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/indoor#values) [indoor](https://wiki.openstreetmap.org/wiki/Key:indoor) | Multiple choice | [yes](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:indoor%3Dno)
 [<img src='https://mapcomplete.org/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/level#values) [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)
@@ -193,9 +193,16 @@ The question is  *What coins can you use to pay here?*
   - *50 cent coins are accepted*  corresponds with  `payment:coins:denominations=0.50 EUR`
   - *1 euro coins are accepted*  corresponds with  `payment:coins:denominations=1 EUR`
   - *2 euro coins are accepted*  corresponds with  `payment:coins:denominations=2 EUR`
+  - *5 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.05 CHF`
+  - *10 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.10 CHF`
+  - *20 centimes coins are accepted*  corresponds with  `payment:coins:denominations=0.20 CHF`
+  - *½ franc coins are accepted*  corresponds with  `payment:coins:denominations=0.50 CHF`
+  - *1 franc coins are accepted*  corresponds with  `payment:coins:denominations=1 CHF`
+  - *2 francs coins are accepted*  corresponds with  `payment:coins:denominations=2 CHF`
+  - *5 francs coins are accepted*  corresponds with  `payment:coins:denominations=5 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 
@@ -216,9 +223,15 @@ The question is  *what notes can you use to pay here?*
   - *100 euro notes are accepted*  corresponds with  `payment:notes:denominations=100 EUR`
   - *200 euro notes are accepted*  corresponds with  `payment:notes:denominations=200 EUR`
   - *500 euro notes are accepted*  corresponds with  `payment:notes:denominations=500 EUR`
+  - *10 francs notes are accepted*  corresponds with  `payment:notes:denominations=10 CHF`
+  - *20 francs notes are accepted*  corresponds with  `payment:notes:denominations=20 CHF`
+  - *50 francs notes are accepted*  corresponds with  `payment:notes:denominations=50 CHF`
+  - *100 francs notes are accepted*  corresponds with  `payment:notes:denominations=100 CHF`
+  - *200 francs notes are accepted*  corresponds with  `payment:notes:denominations=200 CHF`
+  - *1000 francs notes are accepted*  corresponds with  `payment:notes:denominations=1000 CHF`
 
 
-This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency=EUR`
+This tagrendering is only visible in the popup if the following condition is met: `payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$`
 
 
 

Docs/SpecialInputElements.md

@@ -108,11 +108,11 @@ key | the value of this tag will initialize search (default: name)
 options | A JSON-object of type `{ removePrefixes: string[], removePostfixes: string[] }`. 
 
 subarg \| doc
--------- | -----
+-------- \| -----
-removePrefixes | remove these snippets of text from the start of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes
+removePrefixes \| remove these snippets of text from the start of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes
-removePostfixes | remove these snippets of text from the end of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes.
+removePostfixes \| remove these snippets of text from the end of the passed string to search. This is either a list OR a hash of languages to a list. The individual strings are interpreted as case ignoring regexes.
-instanceOf | A list of Q-identifier which indicates that the search results _must_ be an entity of this type, e.g. [`Q5`](https://www.wikidata.org/wiki/Q5) for humans
+instanceOf \| A list of Q-identifier which indicates that the search results _must_ be an entity of this type, e.g. [`Q5`](https://www.wikidata.org/wiki/Q5) for humans
-notInstanceof | A list of Q-identifiers which indicates that the search results _must not_ be an entity of this type, e.g. [`Q79007`](https://www.wikidata.org/wiki/Q79007) to filter away all streets from the search results
+notInstanceof \| A list of Q-identifiers which indicates that the search results _must not_ be an entity of this type, e.g. [`Q79007`](https://www.wikidata.org/wiki/Q79007) to filter away all streets from the search results
 
  
 
@@ -226,9 +226,9 @@ name | doc
 options | A JSON-object of type `{ prefix: string, postfix: string }`.  
 
 subarg \| doc
--------- | -----
+-------- \| -----
-prefix | Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse.
+prefix \| Piece of text that will always be added to the front of the generated opening hours. If the OSM-data does not start with this, it will fail to parse.
-postfix | Piece of text that will always be added to the end of the generated opening hours
+postfix \| Piece of text that will always be added to the end of the generated opening hours
 
  
 

Docs/SpecialRenderings.md

@@ -638,17 +638,12 @@ way_to_conflate | _undefined_ | The key, of which the corresponding value is the
 
 name | default | description
 ------ | --------- | -------------
-mode | expandable | Indicates how this component is initialized. Options are: 
+mode | closed | Either `open` or `closed`. If `open`, then the image carousel will always be shown
-
-- `open`: always show and load the pictures
-- `collapsable`: show the pictures, but a user can collapse them
-- `expandable`: shown by default; but a user can collapse them.
-mapillary | true | If 'true', includes a link to mapillary on this location.
  
 
 #### Example usage of nearby_images 
 
- `{nearby_images(expandable,true)}`
+ `{nearby_images(closed)}`
 
 
 
@@ -982,18 +977,19 @@ button_text | _undefined_ | The text shown on the button in the UI
 
 ### link 
 
- Construct a link. By using the 'special' visualisation notation, translation should be easier 
+ Construct a link. By using the 'special' visualisation notation, translations should be easier 
 
 name | default | description
 ------ | --------- | -------------
 text | _undefined_ | Text to be shown
 href | _undefined_ | The URL to link to
 class | _undefined_ | CSS-classes to add to the element
+download | _undefined_ | If set, this link will act as a download-button. The contents of `href` will be offered for download; this parameter will act as the proposed filename
  
 
 #### Example usage of link 
 
- `{link(,,)}`
+ `{link(,,,)}`
 
 
 

Docs/TagInfo/mapcomplete_atm.json

@@ -79,37 +79,37 @@
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=5 EUR with a fixed text, namely '5 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=5 EUR with a fixed text, namely '5 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "5 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=10 EUR with a fixed text, namely '10 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=10 EUR with a fixed text, namely '10 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "10 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=20 EUR with a fixed text, namely '20 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=20 EUR with a fixed text, namely '20 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "20 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=50 EUR with a fixed text, namely '50 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=50 EUR with a fixed text, namely '50 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "50 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=100 EUR with a fixed text, namely '100 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=100 EUR with a fixed text, namely '100 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "100 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=200 EUR with a fixed text, namely '200 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=200 EUR with a fixed text, namely '200 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "200 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=500 EUR with a fixed text, namely '500 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=500 EUR with a fixed text, namely '500 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'ATM Machines') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "500 EUR"
     },
     {

Docs/TagInfo/mapcomplete_bicycle_rental.json

@@ -102,7 +102,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bicycle rental' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Bicycle rental')"
+      "description": "Layer 'Bicycle rental' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Bicycle rental')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_bicyclelib.json

@@ -61,7 +61,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bicycle library' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Bicycle libraries')"
+      "description": "Layer 'Bicycle library' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Bicycle libraries')"
     },
     {
       "key": "opening_hours",

Docs/TagInfo/mapcomplete_blind_osm.json

@@ -1066,6 +1066,26 @@
       "description": "Layer 'Elevator' shows hearing_loop=no with a fixed text, namely 'This place <b>does not</b> have an audio induction loop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
       "value": "no"
     },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=yes with a fixed text, namely 'This elevator has tactile writing in Braille' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "yes"
+    },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=no with a fixed text, namely 'This elevator does not have tactile writing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "no"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=yes with a fixed text, namely 'This elevator has speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "yes"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=no with a fixed text, namely 'This elevator does not have speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'OSM for the blind')",
+      "value": "no"
+    },
     {
       "key": "highway",
       "description": "The MapComplete theme OSM for the blind has a layer Stairs showing features with this tag",

Docs/TagInfo/mapcomplete_cafes_and_pubs.json

@@ -136,7 +136,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Cafés and pubs' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Cafés and pubs')"
+      "description": "Layer 'Cafés and pubs' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Cafés and pubs')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_climbing.json

@@ -50,7 +50,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Climbing club' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+      "description": "Layer 'Climbing club' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
     {
       "key": "phone",
@@ -149,7 +149,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+      "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
     {
       "key": "charge",
@@ -772,7 +772,7 @@
       "description": "Layer 'Climbing opportunities?' shows values with key 'access:description' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
     {
-      "key": "service:repair:climbing_shoes",
+      "key": "service:climbing_shoes:repair",
       "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Shop showing features with this tag",
       "value": "yes"
     },
@@ -787,13 +787,13 @@
       "value": "shoemaker"
     },
     {
-      "key": "service:repair:climbing_shoes",
+      "key": "service:climbing_shoes:repair",
-      "description": "Layer 'Shop' shows service:repair:climbing_shoes=yes with a fixed text, namely 'This shop repairs climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "description": "Layer 'Shop' shows service:climbing_shoes:repair=yes with a fixed text, namely 'This shop repairs climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
       "value": "yes"
     },
     {
-      "key": "service:repair:climbing_shoes",
+      "key": "service:climbing_shoes:repair",
-      "description": "Layer 'Shop' shows service:repair:climbing_shoes=no with a fixed text, namely 'This shop does not repair climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "description": "Layer 'Shop' shows service:climbing_shoes:repair=no with a fixed text, namely 'This shop does not repair climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
       "value": "no"
     },
     {
@@ -1642,7 +1642,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
     {
       "key": "phone",
@@ -1800,13 +1800,13 @@
       "value": "key_cutter"
     },
     {
-      "key": "service:repair:climbing_shoes",
+      "key": "service:climbing_shoes:repair",
-      "description": "Layer 'Shop' shows service:repair:climbing_shoes=yes with a fixed text, namely 'This shop repairs climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "description": "Layer 'Shop' shows service:climbing_shoes:repair=yes with a fixed text, namely 'This shop repairs climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
       "value": "yes"
     },
     {
-      "key": "service:repair:climbing_shoes",
+      "key": "service:climbing_shoes:repair",
-      "description": "Layer 'Shop' shows service:repair:climbing_shoes=no with a fixed text, namely 'This shop does not repair climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "description": "Layer 'Shop' shows service:climbing_shoes:repair=no with a fixed text, namely 'This shop does not repair climbing shoes' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
       "value": "no"
     },
     {
@@ -2655,7 +2655,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     },
     {
       "key": "phone",
@@ -2797,6 +2797,303 @@
       "key": "organic",
       "description": "Layer 'Shop' shows organic=no with a fixed text, namely 'This shop does not offer organic products' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if shop=supermarket|shop=convenience|shop=farm|shop=greengrocer|shop=health_food|shop=clothes|shop=shoes|shop=butcher|shop=cosmetics|shop=deli|shop=bakery|shop=alcohol|shop=seafood|shop=beverages|shop=florist)",
       "value": "no"
+    },
+    {
+      "key": "amenity",
+      "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Drinking water showing features with this tag",
+      "value": "drinking_water"
+    },
+    {
+      "key": "drinking_water",
+      "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Drinking water showing features with this tag",
+      "value": "yes"
+    },
+    {
+      "key": "id",
+      "description": "Layer 'Drinking water' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if _backend~.+&_last_edit:passed_time<300&|_version_number=1)"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Drinking water allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "operational_status",
+      "description": "Layer 'Drinking water' shows and asks freeform values for key 'operational_status' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "operational_status",
+      "description": "Layer 'Drinking water' shows  with a fixed text, namely 'This drinking water works' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key operational_status.",
+      "value": ""
+    },
+    {
+      "key": "operational_status",
+      "description": "Layer 'Drinking water' shows operational_status=broken with a fixed text, namely 'This drinking water is broken' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "broken"
+    },
+    {
+      "key": "operational_status",
+      "description": "Layer 'Drinking water' shows operational_status=closed with a fixed text, namely 'This drinking water is closed' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "closed"
+    },
+    {
+      "key": "bottle",
+      "description": "Layer 'Drinking water' shows bottle=yes with a fixed text, namely 'It is easy to refill water bottles' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "bottle",
+      "description": "Layer 'Drinking water' shows bottle=no with a fixed text, namely 'Water bottles may not fit' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "amenity",
+      "description": "The MapComplete theme Climbing gyms, clubs and spots has a layer Toilets showing features with this tag",
+      "value": "toilets"
+    },
+    {
+      "key": "id",
+      "description": "Layer 'Toilets' shows id~.+ with a fixed text, namely 'You just created this element! Thanks for sharing this info with the world and helping people worldwide.' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if _backend~.+&_last_edit:passed_time<300&|_version_number=1)"
+    },
+    {
+      "key": "image",
+      "description": "The layer 'Toilets allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Toilets allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Toilets allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Toilets allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Toilets' shows and asks freeform values for key 'level' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "location",
+      "description": "Layer 'Toilets' shows location=underground with a fixed text, namely 'Located underground' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "underground"
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Toilets' shows level=0 with a fixed text, namely 'Located on the ground floor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "0"
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Toilets' shows  with a fixed text, namely 'Located on the ground floor' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') Picking this answer will delete the key level.",
+      "value": ""
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Toilets' shows level=1 with a fixed text, namely 'Located on the first floor' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "1"
+    },
+    {
+      "key": "level",
+      "description": "Layer 'Toilets' shows level=-1 with a fixed text, namely 'Located on the first basement level' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "-1"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Toilets' shows and asks freeform values for key 'access' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Toilets' shows access=yes with a fixed text, namely 'Public access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Toilets' shows access=customers with a fixed text, namely 'Only access to customers' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "customers"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Toilets' shows access=no with a fixed text, namely 'Not accessible' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Toilets' shows access=key with a fixed text, namely 'Accessible, but one has to ask a key to enter' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "key"
+    },
+    {
+      "key": "access",
+      "description": "Layer 'Toilets' shows access=public with a fixed text, namely 'Public access' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "public"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Toilets' shows fee=yes with a fixed text, namely 'These are paid toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if access!=no)",
+      "value": "yes"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Toilets' shows fee=no with a fixed text, namely 'Free to use' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if access!=no)",
+      "value": "no"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Toilets' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)"
+    },
+    {
+      "key": "payment:cash",
+      "description": "Layer 'Toilets' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:cards",
+      "description": "Layer 'Toilets' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:qr_code",
+      "description": "Layer 'Toilets' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:coins",
+      "description": "Layer 'Toilets' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:notes",
+      "description": "Layer 'Toilets' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:debit_cards",
+      "description": "Layer 'Toilets' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "payment:credit_cards",
+      "description": "Layer 'Toilets' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if fee=yes)",
+      "value": "yes"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Toilets' shows and asks freeform values for key 'opening_hours' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if access!=no)"
+    },
+    {
+      "key": "opening_hours",
+      "description": "Layer 'Toilets' shows opening_hours=24/7 with a fixed text, namely '24/7 opened (including holidays)' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if access!=no)",
+      "value": "24/7"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Toilets' shows wheelchair=yes with a fixed text, namely 'There is a dedicated toilet for wheelchair users' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Toilets' shows wheelchair=no with a fixed text, namely 'No wheelchair access' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "wheelchair",
+      "description": "Layer 'Toilets' shows wheelchair=designated with a fixed text, namely 'There is only a dedicated toilet for wheelchair users' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "designated"
+    },
+    {
+      "key": "door:width",
+      "description": "Layer 'Toilets' shows and asks freeform values for key 'door:width' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if wheelchair=yes|wheelchair=designated)"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets' shows toilets:position=seated with a fixed text, namely 'There are only seated toilets' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "seated"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets' shows toilets:position=urinal with a fixed text, namely 'There are only urinals here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "urinal"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets' shows toilets:position=squat with a fixed text, namely 'There are only squat toilets here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "squat"
+    },
+    {
+      "key": "toilets:position",
+      "description": "Layer 'Toilets' shows toilets:position=seated;urinal with a fixed text, namely 'Both seated toilets and urinals are available here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "seated;urinal"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Toilets' shows changing_table=yes with a fixed text, namely 'A changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "changing_table",
+      "description": "Layer 'Toilets' shows changing_table=no with a fixed text, namely 'No changing table is available' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets' shows and asks freeform values for key 'changing_table:location' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if changing_table=yes)"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets' shows changing_table:location=female_toilet with a fixed text, namely 'The changing table is in the toilet for women. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if changing_table=yes)",
+      "value": "female_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets' shows changing_table:location=male_toilet with a fixed text, namely 'The changing table is in the toilet for men. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if changing_table=yes)",
+      "value": "male_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets' shows changing_table:location=wheelchair_toilet with a fixed text, namely 'The changing table is in the toilet for wheelchair users. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if changing_table=yes)",
+      "value": "wheelchair_toilet"
+    },
+    {
+      "key": "changing_table:location",
+      "description": "Layer 'Toilets' shows changing_table:location=dedicated_room with a fixed text, namely 'The changing table is in a dedicated room. ' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if changing_table=yes)",
+      "value": "dedicated_room"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Toilets' shows toilets:handwashing=yes with a fixed text, namely 'This toilets have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:handwashing",
+      "description": "Layer 'Toilets' shows toilets:handwashing=no with a fixed text, namely 'This toilets <b>don't</b> have a sink to wash your hands' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')",
+      "value": "no"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Toilets' shows toilets:paper_supplied=yes with a fixed text, namely 'This toilet is equipped with toilet paper' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if toilets:position!=urinal)",
+      "value": "yes"
+    },
+    {
+      "key": "toilets:paper_supplied",
+      "description": "Layer 'Toilets' shows toilets:paper_supplied=no with a fixed text, namely 'You have to bring your own toilet paper to this toilet' and allows to pick this as a default answer (in the mapcomplete.org theme 'Climbing gyms, clubs and spots') (This is only shown if toilets:position!=urinal)",
+      "value": "no"
+    },
+    {
+      "key": "description",
+      "description": "Layer 'Toilets' shows and asks freeform values for key 'description' (in the mapcomplete.org theme 'Climbing gyms, clubs and spots')"
     }
   ]
 }

Docs/TagInfo/mapcomplete_cyclofix.json

@@ -126,7 +126,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bike cafe' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
+      "description": "Layer 'Bike cafe' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
     },
     {
       "key": "opening_hours",
@@ -208,7 +208,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bike repair/shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
+      "description": "Layer 'Bike repair/shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
     },
     {
       "key": "opening_hours",
@@ -505,7 +505,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bicycle rental' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
+      "description": "Layer 'Bicycle rental' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
     },
     {
       "key": "phone",
@@ -682,7 +682,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bicycle library' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
+      "description": "Layer 'Bicycle library' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
     },
     {
       "key": "opening_hours",
@@ -1197,7 +1197,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bike-related object' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
+      "description": "Layer 'Bike-related object' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Cyclofix - a map for cyclists')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_education.json

@@ -100,7 +100,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Colleges and universities' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Education')"
+      "description": "Layer 'Colleges and universities' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Education')"
     },
     {
       "key": "phone",
@@ -253,7 +253,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Primary and secondary schools' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Education')"
+      "description": "Layer 'Primary and secondary schools' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Education')"
     },
     {
       "key": "amenity",
@@ -302,7 +302,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Kindergartens and childcare' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Education')"
+      "description": "Layer 'Kindergartens and childcare' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Education')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_elongated_coin.json

@@ -73,39 +73,54 @@
       "description": "Layer 'Penny Presses' shows coin:design_count=4 with a fixed text, namely 'This penny press has four designs available.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
       "value": "4"
     },
+    {
+      "key": "fee",
+      "description": "Layer 'Penny Presses' shows  with a fixed text, namely 'It costs money to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') Picking this answer will delete the key fee.",
+      "value": ""
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Penny Presses' shows fee=yes with a fixed text, namely 'It costs money to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "value": "yes"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Penny Presses' shows fee=no with a fixed text, namely 'It is free to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "value": "no"
+    },
     {
       "key": "payment:cash",
-      "description": "Layer 'Penny Presses' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:cards",
-      "description": "Layer 'Penny Presses' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:qr_code",
-      "description": "Layer 'Penny Presses' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:coins",
-      "description": "Layer 'Penny Presses' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:notes",
-      "description": "Layer 'Penny Presses' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:debit_cards",
-      "description": "Layer 'Penny Presses' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:credit_cards",
-      "description": "Layer 'Penny Presses' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
@@ -137,6 +152,16 @@
       "description": "Layer 'Penny Presses' shows coin:type=50cent with a fixed text, namely 'This penny press uses a 50 cent coin for pressing.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
       "value": "50cent"
     },
+    {
+      "key": "coin:type",
+      "description": "Layer 'Penny Presses' shows coin:type=10centimes with a fixed text, namely 'This penny press uses a 10 centimes coin for pressing.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "value": "10centimes"
+    },
+    {
+      "key": "coin:type",
+      "description": "Layer 'Penny Presses' shows coin:type=20centimes with a fixed text, namely 'This penny press uses a 20 centimes coin for pressing.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "value": "20centimes"
+    },
     {
       "key": "website",
       "description": "Layer 'Penny Presses' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Penny Presses')"
@@ -147,58 +172,103 @@
     },
     {
       "key": "charge",
-      "description": "Layer 'Penny Presses' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Penny Presses')"
+      "description": "Layer 'Penny Presses' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)"
     },
     {
       "key": "charge",
-      "description": "Layer 'Penny Presses' shows charge=1 EUR with a fixed text, namely 'It costs 1 euro to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows charge=1 EUR with a fixed text, namely 'It costs 1 euro to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "1 EUR"
     },
     {
       "key": "charge",
-      "description": "Layer 'Penny Presses' shows charge=2 EUR with a fixed text, namely 'It costs 2 euros to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",
+      "description": "Layer 'Penny Presses' shows charge=2 EUR with a fixed text, namely 'It costs 2 euros to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
       "value": "2 EUR"
     },
+    {
+      "key": "charge",
+      "description": "Layer 'Penny Presses' shows charge=2 CHF with a fixed text, namely 'It costs 2 Swiss francs to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Penny Presses' shows charge=1 CHF with a fixed text, namely 'It costs 1 Swiss franc to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if fee=yes|)",
+      "value": "1 CHF"
+    },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.01 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.02 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.05 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.10 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.20 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.50 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "1 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "2 EUR"
     },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.05 CHF with a fixed text, namely '5 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.05 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.10 CHF with a fixed text, namely '10 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.10 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.20 CHF with a fixed text, namely '20 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.20 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.50 CHF with a fixed text, namely '½ franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.50 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=1 CHF with a fixed text, namely '1 franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=2 CHF with a fixed text, namely '2 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=5 CHF with a fixed text, namely '5 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "5 CHF"
+    },
     {
       "key": "indoor",
       "description": "Layer 'Penny Presses' shows indoor=yes with a fixed text, namely 'This penny press is located indoors.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Penny Presses')",

Docs/TagInfo/mapcomplete_food.json

@@ -101,7 +101,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Restaurants and fast food' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Restaurants and fast food')"
+      "description": "Layer 'Restaurants and fast food' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Restaurants and fast food')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_fritures.json

@@ -105,7 +105,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Fries shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Fries shops')"
+      "description": "Layer 'Fries shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Fries shops')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_ghostbikes.json

@@ -2,7 +2,7 @@
   "data_format": 1,
   "project": {
     "name": "MapComplete Ghost bikes",
-    "description": "A ",
+    "description": "A <b>ghost bike</b> is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location",
     "project_url": "https://mapcomplete.org/ghostbikes",
     "doc_url": "https://github.com/pietervdvn/MapComplete/tree/master/assets/themes/",
     "icon_url": "https://mapcomplete.org/assets/themes/ghostbikes/logo.svg",

Docs/TagInfo/mapcomplete_hackerspaces.json

@@ -92,7 +92,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hackerspace' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Hackerspaces')"
+      "description": "Layer 'Hackerspace' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Hackerspaces')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_healthcare.json

@@ -66,7 +66,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
+      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -156,7 +156,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
+      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -209,7 +209,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
+      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -265,7 +265,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
+      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -326,7 +326,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -1226,7 +1226,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
     },
     {
       "key": "phone",
@@ -2229,7 +2229,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Healthcare')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_hotels.json

@@ -53,7 +53,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Hotels')"
+      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Hotels')"
     },
     {
       "key": "website",

Docs/TagInfo/mapcomplete_indoors.json

@@ -179,6 +179,26 @@
       "description": "Layer 'Elevator' shows hearing_loop=no with a fixed text, namely 'This place <b>does not</b> have an audio induction loop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
       "value": "no"
     },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=yes with a fixed text, namely 'This elevator has tactile writing in Braille' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
+      "value": "yes"
+    },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=no with a fixed text, namely 'This elevator does not have tactile writing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
+      "value": "no"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=yes with a fixed text, namely 'This elevator has speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
+      "value": "yes"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=no with a fixed text, namely 'This elevator does not have speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'Indoors')",
+      "value": "no"
+    },
     {
       "key": "entrance",
       "description": "The MapComplete theme Indoors has a layer Entrance showing features with this tag"

Docs/TagInfo/mapcomplete_onwheels.json

@@ -136,7 +136,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Cafés and pubs' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'Cafés and pubs' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "phone",
@@ -611,7 +611,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Restaurants and fast food' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'Restaurants and fast food' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "phone",
@@ -2100,7 +2100,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "phone",
@@ -2528,7 +2528,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2609,7 +2609,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2685,7 +2685,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2863,6 +2863,26 @@
       "description": "Layer 'Elevator' shows hearing_loop=no with a fixed text, namely 'This place <b>does not</b> have an audio induction loop' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
       "value": "no"
     },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=yes with a fixed text, namely 'This elevator has tactile writing in Braille' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=no with a fixed text, namely 'This elevator does not have tactile writing' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "no"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=yes with a fixed text, namely 'This elevator has speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "yes"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=no with a fixed text, namely 'This elevator does not have speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'OnWheels')",
+      "value": "no"
+    },
     {
       "key": "tourism",
       "description": "The MapComplete theme OnWheels has a layer Hotels showing features with this tag",
@@ -2906,7 +2926,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -3024,7 +3044,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'governments' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
+      "description": "Layer 'governments' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'OnWheels')"
     },
     {
       "key": "website",

Docs/TagInfo/mapcomplete_parkings.json

@@ -309,79 +309,144 @@
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.01 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.02 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.05 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.10 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.20 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.50 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "1 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "2 EUR"
     },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 CHF with a fixed text, namely '5 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.05 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 CHF with a fixed text, namely '10 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.10 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 CHF with a fixed text, namely '20 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.20 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 CHF with a fixed text, namely '½ franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.50 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 CHF with a fixed text, namely '1 franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 CHF with a fixed text, namely '2 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=5 CHF with a fixed text, namely '5 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "5 CHF"
+    },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "5 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "10 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "20 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "50 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "100 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "200 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "500 EUR"
     },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 CHF with a fixed text, namely '10 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "10 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 CHF with a fixed text, namely '20 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "20 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 CHF with a fixed text, namely '50 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "50 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 CHF with a fixed text, namely '100 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "100 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 CHF with a fixed text, namely '200 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "200 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=1000 CHF with a fixed text, namely '1000 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Parking') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1000 CHF"
+    },
     {
       "key": "ref",
       "description": "Layer 'Parking Ticket Machines' shows and asks freeform values for key 'ref' (in the mapcomplete.org theme 'Parking')"

Docs/TagInfo/mapcomplete_personal.json

@@ -637,37 +637,37 @@
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=5 EUR with a fixed text, namely '5 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=5 EUR with a fixed text, namely '5 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "5 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=10 EUR with a fixed text, namely '10 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=10 EUR with a fixed text, namely '10 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "10 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=20 EUR with a fixed text, namely '20 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=20 EUR with a fixed text, namely '20 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "20 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=50 EUR with a fixed text, namely '50 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=50 EUR with a fixed text, namely '50 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "50 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=100 EUR with a fixed text, namely '100 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=100 EUR with a fixed text, namely '100 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "100 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=200 EUR with a fixed text, namely '200 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=200 EUR with a fixed text, namely '200 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "200 EUR"
     },
     {
       "key": "cash_out:notes:denominations",
-      "description": "Layer 'ATMs' shows cash_out:notes:denominations=500 EUR with a fixed text, namely '500 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_country=at|_country=be|_country=cy|_country=de|_country=ee|_country=es|_country=fi|_country=fr|_country=gr|_country=hr|_country=ie|_country=it|_country=lt|_country=lu|_country=lv|_country=mt|_country=nl|_country=pt|_country=si|_country=sk)",
+      "description": "Layer 'ATMs' shows cash_out:notes:denominations=500 EUR with a fixed text, namely '500 euro notes can be withdrawn' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if |cash_out=yes&|_currency~^(.*EUR.*)$)",
       "value": "500 EUR"
     },
     {
@@ -1189,7 +1189,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bicycle library' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Bicycle library' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -1330,7 +1330,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bicycle rental' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Bicycle rental' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -1692,7 +1692,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bike cafe' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Bike cafe' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -2192,7 +2192,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bike repair/shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Bike repair/shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -2480,7 +2480,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Bike-related object' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Bike-related object' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -2777,7 +2777,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Cafés and pubs' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Cafés and pubs' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -4338,7 +4338,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Climbing club' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Climbing club' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -4408,7 +4408,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Climbing gyms' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "charge",
@@ -5920,7 +5920,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Dentist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -5990,7 +5990,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -6238,6 +6238,26 @@
       "description": "Layer 'Elevator' shows hearing_loop=no with a fixed text, namely 'This place <b>does not</b> have an audio induction loop' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
       "value": "no"
     },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=yes with a fixed text, namely 'This elevator has tactile writing in Braille' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "tactile_writing:braille",
+      "description": "Layer 'Elevator' shows tactile_writing:braille=no with a fixed text, namely 'This elevator does not have tactile writing' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=yes with a fixed text, namely 'This elevator has speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "speech_output",
+      "description": "Layer 'Elevator' shows speech_output=no with a fixed text, namely 'This elevator does not have speech output' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Personal theme has a layer Penny Presses showing features with this tag",
@@ -6301,39 +6321,54 @@
       "description": "Layer 'Penny Presses' shows coin:design_count=4 with a fixed text, namely 'This penny press has four designs available.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
       "value": "4"
     },
+    {
+      "key": "fee",
+      "description": "Layer 'Penny Presses' shows  with a fixed text, namely 'It costs money to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') Picking this answer will delete the key fee.",
+      "value": ""
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Penny Presses' shows fee=yes with a fixed text, namely 'It costs money to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "yes"
+    },
+    {
+      "key": "fee",
+      "description": "Layer 'Penny Presses' shows fee=no with a fixed text, namely 'It is free to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "no"
+    },
     {
       "key": "payment:cash",
-      "description": "Layer 'Penny Presses' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows payment:cash=yes with a fixed text, namely 'Cash is accepted here' (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:cards",
-      "description": "Layer 'Penny Presses' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows payment:cards=yes with a fixed text, namely 'Payment cards are accepted here' (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:qr_code",
-      "description": "Layer 'Penny Presses' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows payment:qr_code=yes with a fixed text, namely 'Payment by QR-code is possible here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:coins",
-      "description": "Layer 'Penny Presses' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows payment:coins=yes with a fixed text, namely 'Coins are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:notes",
-      "description": "Layer 'Penny Presses' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows payment:notes=yes with a fixed text, namely 'Bank notes are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:debit_cards",
-      "description": "Layer 'Penny Presses' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows payment:debit_cards=yes with a fixed text, namely 'Debit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
       "key": "payment:credit_cards",
-      "description": "Layer 'Penny Presses' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows payment:credit_cards=yes with a fixed text, namely 'Credit cards are accepted here' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "yes"
     },
     {
@@ -6365,6 +6400,16 @@
       "description": "Layer 'Penny Presses' shows coin:type=50cent with a fixed text, namely 'This penny press uses a 50 cent coin for pressing.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
       "value": "50cent"
     },
+    {
+      "key": "coin:type",
+      "description": "Layer 'Penny Presses' shows coin:type=10centimes with a fixed text, namely 'This penny press uses a 10 centimes coin for pressing.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "10centimes"
+    },
+    {
+      "key": "coin:type",
+      "description": "Layer 'Penny Presses' shows coin:type=20centimes with a fixed text, namely 'This penny press uses a 20 centimes coin for pressing.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "value": "20centimes"
+    },
     {
       "key": "website",
       "description": "Layer 'Penny Presses' shows and asks freeform values for key 'website' (in the mapcomplete.org theme 'Personal theme')"
@@ -6375,58 +6420,103 @@
     },
     {
       "key": "charge",
-      "description": "Layer 'Penny Presses' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Penny Presses' shows and asks freeform values for key 'charge' (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)"
     },
     {
       "key": "charge",
-      "description": "Layer 'Penny Presses' shows charge=1 EUR with a fixed text, namely 'It costs 1 euro to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows charge=1 EUR with a fixed text, namely 'It costs 1 euro to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "1 EUR"
     },
     {
       "key": "charge",
-      "description": "Layer 'Penny Presses' shows charge=2 EUR with a fixed text, namely 'It costs 2 euros to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
+      "description": "Layer 'Penny Presses' shows charge=2 EUR with a fixed text, namely 'It costs 2 euros to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
       "value": "2 EUR"
     },
+    {
+      "key": "charge",
+      "description": "Layer 'Penny Presses' shows charge=2 CHF with a fixed text, namely 'It costs 2 Swiss francs to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "charge",
+      "description": "Layer 'Penny Presses' shows charge=1 CHF with a fixed text, namely 'It costs 1 Swiss franc to press a penny.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if fee=yes|)",
+      "value": "1 CHF"
+    },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.01 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.02 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.05 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.10 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.20 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.50 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "1 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Penny Presses' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "2 EUR"
     },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.05 CHF with a fixed text, namely '5 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.05 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.10 CHF with a fixed text, namely '10 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.10 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.20 CHF with a fixed text, namely '20 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.20 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=0.50 CHF with a fixed text, namely '½ franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.50 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=1 CHF with a fixed text, namely '1 franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=2 CHF with a fixed text, namely '2 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Penny Presses' shows payment:coins:denominations=5 CHF with a fixed text, namely '5 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "5 CHF"
+    },
     {
       "key": "indoor",
       "description": "Layer 'Penny Presses' shows indoor=yes with a fixed text, namely 'This penny press is located indoors.' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme')",
@@ -6929,7 +7019,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Fitness Centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Fitness Centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -7276,7 +7366,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Restaurants and fast food' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Restaurants and fast food' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -7768,7 +7858,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'governments' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'governments' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -7864,7 +7954,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hackerspace' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Hackerspace' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -7993,7 +8083,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -8050,7 +8140,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -8447,7 +8537,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Kindergartens and childcare' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Kindergartens and childcare' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -9375,79 +9465,144 @@
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.01 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.02 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.05 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.10 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.20 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.50 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "1 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "2 EUR"
     },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.05 CHF with a fixed text, namely '5 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.05 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.10 CHF with a fixed text, namely '10 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.10 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.20 CHF with a fixed text, namely '20 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.20 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=0.50 CHF with a fixed text, namely '½ franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.50 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=1 CHF with a fixed text, namely '1 franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=2 CHF with a fixed text, namely '2 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:coins:denominations=5 CHF with a fixed text, namely '5 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "5 CHF"
+    },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "5 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "10 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "20 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "50 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "100 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "200 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "500 EUR"
     },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=10 CHF with a fixed text, namely '10 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "10 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=20 CHF with a fixed text, namely '20 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "20 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=50 CHF with a fixed text, namely '50 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "50 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=100 CHF with a fixed text, namely '100 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "100 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=200 CHF with a fixed text, namely '200 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "200 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Parking Ticket Machines' shows payment:notes:denominations=1000 CHF with a fixed text, namely '1000 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1000 CHF"
+    },
     {
       "key": "ref",
       "description": "Layer 'Parking Ticket Machines' shows and asks freeform values for key 'ref' (in the mapcomplete.org theme 'Personal theme')"
@@ -9524,7 +9679,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -9605,7 +9760,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Physiotherapist' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -10524,7 +10679,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Recycling' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme') (This is only shown if recycling_type=centre)"
+      "description": "Layer 'Recycling' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme') (This is only shown if recycling_type=centre)"
     },
     {
       "key": "phone",
@@ -10714,7 +10869,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Primary and secondary schools' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Primary and secondary schools' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "amenity",
@@ -11624,7 +11779,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -12164,7 +12319,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Sports centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Sports centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "wheelchair",
@@ -12750,7 +12905,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Colleges and universities' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
+      "description": "Layer 'Colleges and universities' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -12865,79 +13020,144 @@
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.01 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.02 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.05 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.10 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.20 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.50 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "1 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "2 EUR"
     },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.05 CHF with a fixed text, namely '5 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.05 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.10 CHF with a fixed text, namely '10 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.10 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.20 CHF with a fixed text, namely '20 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.20 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=0.50 CHF with a fixed text, namely '½ franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.50 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=1 CHF with a fixed text, namely '1 franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=2 CHF with a fixed text, namely '2 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:coins:denominations=5 CHF with a fixed text, namely '5 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "5 CHF"
+    },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "5 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "10 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "20 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "50 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "100 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "200 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "500 EUR"
     },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=10 CHF with a fixed text, namely '10 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "10 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=20 CHF with a fixed text, namely '20 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "20 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=50 CHF with a fixed text, namely '50 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "50 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=100 CHF with a fixed text, namely '100 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "100 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=200 CHF with a fixed text, namely '200 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "200 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Ticket Machines' shows payment:notes:denominations=1000 CHF with a fixed text, namely '1000 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1000 CHF"
+    },
     {
       "key": "amenity",
       "description": "The MapComplete theme Personal theme has a layer Toilets showing features with this tag",
@@ -13908,79 +14128,144 @@
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.01 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.02 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.05 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.10 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.20 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.50 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "1 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "2 EUR"
     },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 CHF with a fixed text, namely '5 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.05 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 CHF with a fixed text, namely '10 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.10 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 CHF with a fixed text, namely '20 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.20 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 CHF with a fixed text, namely '½ franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.50 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 CHF with a fixed text, namely '1 franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 CHF with a fixed text, namely '2 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=5 CHF with a fixed text, namely '5 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "5 CHF"
+    },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "5 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "10 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "20 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "50 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "100 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "200 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "500 EUR"
     },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 CHF with a fixed text, namely '10 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "10 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 CHF with a fixed text, namely '20 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "20 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 CHF with a fixed text, namely '50 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "50 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 CHF with a fixed text, namely '100 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "100 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 CHF with a fixed text, namely '200 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "200 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=1000 CHF with a fixed text, namely '1000 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Personal theme') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1000 CHF"
+    },
     {
       "key": "operator",
       "description": "Layer 'Vending Machines' shows and asks freeform values for key 'operator' (in the mapcomplete.org theme 'Personal theme')"

Docs/TagInfo/mapcomplete_pets.json

@@ -175,7 +175,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Dog friendly eateries' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'Dog friendly eateries' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "phone",
@@ -1443,7 +1443,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Dog-friendly shops' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'Dog-friendly shops' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_shops.json

@@ -870,7 +870,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Shops')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Shops')"
     },
     {
       "key": "phone",
@@ -1060,7 +1060,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Shops')"
+      "description": "Layer 'Pharmacies' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Shops')"
     },
     {
       "key": "website",

Docs/TagInfo/mapcomplete_sports.json

@@ -237,7 +237,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Fitness Centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Sports')"
+      "description": "Layer 'Fitness Centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Sports')"
     },
     {
       "key": "website",
@@ -523,7 +523,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Sports centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Sports')"
+      "description": "Layer 'Sports centres' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Sports')"
     },
     {
       "key": "wheelchair",
@@ -1396,7 +1396,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Sports')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Sports')"
     },
     {
       "key": "phone",

Docs/TagInfo/mapcomplete_vending_machine.json

@@ -180,79 +180,144 @@
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.01 EUR with a fixed text, namely '1 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.01 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.02 EUR with a fixed text, namely '2 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.02 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 EUR with a fixed text, namely '5 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.05 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 EUR with a fixed text, namely '10 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.10 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 EUR with a fixed text, namely '20 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.20 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 EUR with a fixed text, namely '50 cent coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "0.50 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 EUR with a fixed text, namely '1 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "1 EUR"
     },
     {
       "key": "payment:coins:denominations",
-      "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 EUR with a fixed text, namely '2 euro coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "2 EUR"
     },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.05 CHF with a fixed text, namely '5 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.05 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.10 CHF with a fixed text, namely '10 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.10 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.20 CHF with a fixed text, namely '20 centimes coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.20 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=0.50 CHF with a fixed text, namely '½ franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "0.50 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=1 CHF with a fixed text, namely '1 franc coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=2 CHF with a fixed text, namely '2 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "2 CHF"
+    },
+    {
+      "key": "payment:coins:denominations",
+      "description": "Layer 'Vending Machines' shows payment:coins:denominations=5 CHF with a fixed text, namely '5 francs coins are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:coins=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "5 CHF"
+    },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=5 EUR with a fixed text, namely '5 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "5 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 EUR with a fixed text, namely '10 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "10 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 EUR with a fixed text, namely '20 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "20 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 EUR with a fixed text, namely '50 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "50 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 EUR with a fixed text, namely '100 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "100 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 EUR with a fixed text, namely '200 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "200 EUR"
     },
     {
       "key": "payment:notes:denominations",
-      "description": "Layer 'Vending Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency=EUR)",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=500 EUR with a fixed text, namely '500 euro notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
       "value": "500 EUR"
     },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=10 CHF with a fixed text, namely '10 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "10 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=20 CHF with a fixed text, namely '20 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "20 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=50 CHF with a fixed text, namely '50 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "50 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=100 CHF with a fixed text, namely '100 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "100 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=200 CHF with a fixed text, namely '200 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "200 CHF"
+    },
+    {
+      "key": "payment:notes:denominations",
+      "description": "Layer 'Vending Machines' shows payment:notes:denominations=1000 CHF with a fixed text, namely '1000 francs notes are accepted' and allows to pick this as a default answer (in the mapcomplete.org theme 'Vending Machines') (This is only shown if payment:notes=yes|payment:cash=yes&_currency~^(.*EUR.*)$|_currency~^(.*CHF.*)$)",
+      "value": "1000 CHF"
+    },
     {
       "key": "operator",
       "description": "Layer 'Vending Machines' shows and asks freeform values for key 'operator' (in the mapcomplete.org theme 'Vending Machines')"

Docs/TagInfo/mapcomplete_waste.json

@@ -312,7 +312,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'Recycling' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the mapcomplete.org theme 'Waste') (This is only shown if recycling_type=centre)"
+      "description": "Layer 'Recycling' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank' rel='noopener'>{contact:email}</a>' (in the mapcomplete.org theme 'Waste') (This is only shown if recycling_type=centre)"
     },
     {
       "key": "phone",

Docs/Themes/climbing.md

@@ -18,6 +18,8 @@ This theme contains the following layers:
   - [climbing_opportunity](../Layers/climbing_opportunity.md)
   - [shops_with_climbing_shoe_repair](../Layers/shops_with_climbing_shoe_repair.md)
   - [shops](../Layers/shops.md)
+  - [drinking_water](../Layers/drinking_water.md)
+  - [toilet](../Layers/toilet.md)
   - [selected_element](../Layers/selected_element.md)
   - [gps_location](../Layers/gps_location.md)
   - [gps_location_history](../Layers/gps_location_history.md)

Docs/Themes/mapcomplete-changes.md

@@ -27,6 +27,10 @@ Available languages:
 
 
   - en
+  - ca
+  - de
+  - fr
+  - nl
  
 
 This document is autogenerated from [assets/themes/mapcomplete-changes/mapcomplete-changes.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/mapcomplete-changes/mapcomplete-changes.json)

Docs/wikiIndex.txt

@@ -56,6 +56,15 @@
 |genre= POI, editor, cafes_and_pubs
 }}
 {{service_item
+|name= [https://mapcomplete.org/shops shops]
+|region= Worldwide
+|lang= {{#language:en|en}}, {{#language:fr|en}}, {{#language:ja|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:hu|en}}, {{#language:es|en}}, {{#language:nl|en}}, {{#language:da|en}}, {{#language:ca|en}}, {{#language:cs|en}}, {{#language:zh_Hant|en}}
+|descr= A MapComplete theme: An editable map with basic shop information
+|material= {{yes|[https://mapcomplete.org/ Yes]}}
+|image= MapComplete_Screenshot.png
+|genre= POI, editor, shops
+}}
+{{service_item
 |name= [https://mapcomplete.org/playgrounds playgrounds]
 |region= Worldwide
 |lang= {{#language:nl|en}}, {{#language:en|en}}, {{#language:fr|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:ru|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:nb_NO|en}}, {{#language:id|en}}, {{#language:hu|en}}, {{#language:ca|en}}, {{#language:es|en}}, {{#language:da|en}}, {{#language:cs|en}}, {{#language:pl|en}}
@@ -275,7 +284,7 @@
 |name= [https://mapcomplete.org/ghostbikes ghostbikes]
 |region= Worldwide
 |lang= {{#language:en|en}}, {{#language:nl|en}}, {{#language:de|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:fr|en}}, {{#language:it|en}}, {{#language:hu|en}}, {{#language:da|en}}, {{#language:cs|en}}, {{#language:es|en}}, {{#language:ca|en}}
-|descr= A MapComplete theme: A 
+|descr= A MapComplete theme: A ghost bike is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location
 |material= {{yes|[https://mapcomplete.org/ Yes]}}
 |image= MapComplete_Screenshot.png
 |genre= POI, editor, ghostbikes
@@ -434,15 +443,6 @@
 |genre= POI, editor, rainbow_crossings
 }}
 {{service_item
-|name= [https://mapcomplete.org/shops shops]
-|region= Worldwide
-|lang= {{#language:en|en}}, {{#language:fr|en}}, {{#language:ja|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:hu|en}}, {{#language:es|en}}, {{#language:nl|en}}, {{#language:da|en}}, {{#language:ca|en}}, {{#language:cs|en}}, {{#language:zh_Hant|en}}
-|descr= A MapComplete theme: An editable map with basic shop information
-|material= {{yes|[https://mapcomplete.org/ Yes]}}
-|image= MapComplete_Screenshot.png
-|genre= POI, editor, shops
-}}
-{{service_item
 |name= [https://mapcomplete.org/sport_pitches sport_pitches]
 |region= Worldwide
 |lang= {{#language:nl|en}}, {{#language:fr|en}}, {{#language:en|en}}, {{#language:ja|en}}, {{#language:zh_Hant|en}}, {{#language:ru|en}}, {{#language:de|en}}, {{#language:it|en}}, {{#language:hu|en}}, {{#language:es|en}}, {{#language:da|en}}, {{#language:ca|en}}, {{#language:cs|en}}

assets/layers/charging_station/charging_station.json

@@ -49,9 +49,9 @@
         "then": {
           "en": "Charging station for electrical bicycles",
           "nl": "Oplaadpunt voor elektrische fietsen",
+          "ca": "Estació de càrrega per a bicicletes elèctriques",
           "de": "Ladestation für Elektrofahrräder",
-          "es": "Estación de carga para bicicletas eléctricas",
+          "es": "Estación de carga para bicicletas eléctricas"
-          "ca": "Estació de càrrega per a bicicletes elèctriques"
         }
       },
       {
@@ -69,9 +69,9 @@
         "then": {
           "en": "Charging station for cars",
           "nl": "Oplaadpunt voor elektrische auto's",
+          "ca": "Estació de càrrega per a cotxes",
           "de": "Ladestation für Autos",
-          "es": "Estación de carga para coches",
+          "es": "Estación de carga para coches"
-          "ca": "Estació de càrrega per a cotxes"
         }
       }
     ]
@@ -889,7 +889,7 @@
           "then": {
             "en": "<b>Tesla Supercharger CCS</b> (a branded type2_css)",
             "nl": "<b>Tesla Supercharger CCS</b> (een type2 CCS met Tesla-logo)",
-            "ca": "<b>CSS Supercarregador Tesla</b> (tipus2_css de la marca)",
+            "ca": "<b>CSS Supercarregador Tesla</b> (un tipus2_css de la marca)",
             "da": "<b>Tesla Supercharger CCS</b> (en mærkevare type2_css)",
             "de": "<b>Tesla Supercharger CCS</b> (Typ 2 CSS von Tesla)",
             "es": "<b>CCS Supercargador Tesla</b> (un tipo2_css con marca)"
@@ -2762,9 +2762,9 @@
           "then": {
             "en": "<b>Type 2</b> (mennekes) outputs at most 16 A",
             "nl": "<b>Type 2</b> (mennekes) levert een stroom van maximaal 16 A",
+            "ca": "<b>Tipus 2</b> (menneks) surt com a màxim a 16 A",
             "da": "<b>Type 2</b> (mennekes) udgange højst 16 A",
-            "de": "<b>Typ 2</b> (Mennekes) liefert maximal 16 A",
+            "de": "<b>Typ 2</b> (Mennekes) liefert maximal 16 A"
-            "ca": "<b>Tipus 2</b> (menneks) surt com a màxim a 16 A"
           },
           "icon": {
             "path": "./assets/layers/charging_station/Type2_socket.svg",
@@ -2776,9 +2776,9 @@
           "then": {
             "en": "<b>Type 2</b> (mennekes) outputs at most 32 A",
             "nl": "<b>Type 2</b> (mennekes) levert een stroom van maximaal 32 A",
+            "ca": "<b>Tipus 2</b> (menneks) surt com a màxim a 32 A",
             "da": "<b>Type 2</b> (mennekes) udgange højst 32 A",
-            "de": "<b>Typ 2</b> (Mennekes) liefert maximal 32 A",
+            "de": "<b>Typ 2</b> (Mennekes) liefert maximal 32 A"
-            "ca": "<b>Tipus 2</b> (menneks) surt com a màxim a 32 A"
           },
           "icon": {
             "path": "./assets/layers/charging_station/Type2_socket.svg",
@@ -3529,9 +3529,9 @@
       "question": {
         "en": "What current do the plugs with <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> offer?",
         "nl": "Welke stroom levert de stekker van type <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (Een Type 2 met kabel en Tesla-logo)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>?",
+        "ca": "Quin corrent donen els endolls amb <div style='display: inline-block'><b><b>Tesla Supercharger (destinació)</b> (un tipus 2 amb cable amb la marca Tesla)</b> <img style ='amplada: 1rem; mostrar: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> oferta?",
         "da": "Hvilken strømstyrke har stikkene med <div style='display: inline-block'><b><b> Tesla Supercharger (Destination)</b> (A Type 2 med kabel med Tesla-mærket)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> ?",
-        "de": "Welche Stromstärke liefern die Stecker mit <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (Typ 2 mit Kabel von Tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>?",
+        "de": "Welche Stromstärke liefern die Stecker mit <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (Typ 2 mit Kabel von Tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>?"
-        "ca": "Quin corrent donen els endolls amb <div style='display: inline-block'><b><b>Tesla Supercharger (destinació)</b> (un tipus 2 amb cable amb la marca Tesla)</b> <img style ='amplada: 1rem; mostrar: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> oferta?"
       },
       "render": {
         "en": "<div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> outputs at most {socket:tesla_destination:current}A",
@@ -3548,9 +3548,9 @@
           "then": {
             "en": "<b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as tesla) outputs at most 16 A",
             "nl": "<b>Tesla supercharger (Destination</b> (Een Type 2 met kabel en Tesla-logo) levert een stroom van maximaal 16 A",
+            "ca": "<b>Supercarregador Tesla (destinació)</b> (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 16 A",
             "da": "<b>Tesla Supercharger (Destination)</b> (A Type 2 med kabel mærket som tesla) yder højst 16 A",
-            "de": "<b>Tesla Supercharger (Destination)</b> (Typ 2 mit Kabel) liefert maximal 16 A",
+            "de": "<b>Tesla Supercharger (Destination)</b> (Typ 2 mit Kabel) liefert maximal 16 A"
-            "ca": "<b>Supercarregador Tesla (destinació)</b> (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 16 A"
           },
           "icon": {
             "path": "./assets/layers/charging_station/Type2_tethered.svg",
@@ -3562,9 +3562,9 @@
           "then": {
             "en": "<b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 32 A",
             "nl": "<b>Tesla Supercharger (Destination</b> (Een Type 2 met kabel en Tesla-logo) levert een stroom van maximaal 32 A",
+            "ca": "<b>Supercarregador Tesla (destinació)</b> (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 32 A",
             "da": "<b>Tesla Supercharger (Destination)</b> (A Type 2 med kabel af Tesla-mærket) yder højst 32 A",
-            "de": "<b>Tesla Supercharger (Destination)</b> (Typ 2 mit Kabel von Tesla) liefert maximal 32 A",
+            "de": "<b>Tesla Supercharger (Destination)</b> (Typ 2 mit Kabel von Tesla) liefert maximal 32 A"
-            "ca": "<b>Supercarregador Tesla (destinació)</b> (Un Tipus 2 amb un cable de marca Tesla) surt com a màxim a 32 A"
           },
           "icon": {
             "path": "./assets/layers/charging_station/Type2_tethered.svg",
@@ -4480,8 +4480,8 @@
       "render": {
         "en": "More info on <a href='{website}'>{website}</a>",
         "nl": "Meer informatie op <a href='{website}'>{website}</a>",
-        "de": "Weitere Informationen unter <a href='{website}'>{website}</a>",
+        "ca": "Més info a <a href='{website}'>{website}</a>",
-        "ca": "Més info a <a href='{website}'>{website}</a>"
+        "de": "Weitere Informationen unter <a href='{website}'>{website}</a>"
       },
       "freeform": {
         "key": "website",
@@ -4639,7 +4639,7 @@
           "then": {
             "en": "No additional parking cost while charging",
             "nl": "Geen extra parkeerkost tijdens het opladen",
-            "ca": "No hi ha costos d'aparcament addicionals mentre es carrega",
+            "ca": "No cal pagar una taxa addicional mentres es carrega",
             "da": "Ingen ekstra parkeringsomkostninger under opladning",
             "de": "Keine zusätzlichen Parkkosten während des Ladens",
             "es": "No hay costes de aparcamiento adicionales mientras se carga",
@@ -4675,6 +4675,7 @@
       "render": {
         "en": "<h3>Technical questions</h3>The questions below are very technical. Feel free to ignore them<br/>{questions(technical)}",
         "nl": "<h3>Technische vragen</h3>De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt<br/>{questions(technical)}",
+        "ca": "<h3>Preguntes tècniques</h3>Les preguntes següents són molt tècniques. No dubteu a ignorar-les<br/>{questions(technical)}",
         "de": "<h3>Technische Frage</h3>Die nächsten Fragen sind sehr technisch. Du kannst diese auch überspringen.<br/>{questions(technical)}"
       }
     }

assets/layers/ticket_machine/ticket_machine.json

@@ -3,12 +3,14 @@
   "name": {
     "en": "Ticket Machines",
     "de": "Fahrkartenautomaten",
-    "nl": "Kaartautomaten"
+    "nl": "Kaartautomaten",
+    "ca": "Màquines de bitllets"
   },
   "description": {
     "en": "Find ticket machines for public transport tickets",
     "de": "Fahrkartenautomaten für ÖPNV-Tickets finden",
-    "nl": "Zoek kaartautomaten voor het openbaar vervoer"
+    "nl": "Zoek kaartautomaten voor het openbaar vervoer",
+    "ca": "Troba màquines de bitllets per a bitllets de transport públic"
   },
   "source": {
     "osmTags": {
@@ -23,7 +25,8 @@
     "render": {
       "en": "Ticket Machine",
       "de": "Fahrkartenautomat",
-      "nl": "Kaartautomaat"
+      "nl": "Kaartautomaat",
+      "ca": "Màquina de bitllets"
     }
   },
   "tagRenderings": [
@@ -40,7 +43,8 @@
       "render": {
         "en": "This ticket machine is operated by {operator}",
         "de": "Dieser Fahrkartenautomat wird betrieben von {operator}",
-        "nl": "Deze kaartautomaat wordt beheerd door {operator}"
+        "nl": "Deze kaartautomaat wordt beheerd door {operator}",
+        "ca": "{operator} opera aquesta màquina de bitllets"
       },
       "freeform": {
         "key": "operator",
@@ -48,7 +52,8 @@
         "placeholder": {
           "en": "Name of the operator",
           "de": "Name des Betreibers",
-          "nl": "Naam van de beheerder"
+          "nl": "Naam van de beheerder",
+          "ca": "Nom de l'operador"
         }
       },
       "mappings": [
@@ -57,7 +62,8 @@
           "then": {
             "en": "Dutch Railways (NS)",
             "nl": "Nederlandse Spoorwegen (NS)",
-            "de": "Niederländische Eisenbahn (NS)"
+            "de": "Niederländische Eisenbahn (NS)",
+            "ca": "Ferrocarrils holandesos (NS)"
           },
           "addExtraTags": [
             "operator:wikidata=Q23076"

assets/layers/ticket_validator/ticket_validator.json

@@ -2,11 +2,13 @@
   "id": "ticket_validator",
   "name": {
     "en": "Ticket Validators",
-    "de": "Fahrkartenentwerter"
+    "de": "Fahrkartenentwerter",
+    "ca": "Validadors de bitllets"
   },
   "description": {
     "en": "Find ticket validators to validate public transport tickets",
-    "de": "Finden Sie Fahrkartenentwerter, um Tickets für den öffentlichen Nahverkehr zu entwerten"
+    "de": "Finden Sie Fahrkartenentwerter, um Tickets für den öffentlichen Nahverkehr zu entwerten",
+    "ca": "Trobeu validadors de bitllets per validar bitllets de transport públic"
   },
   "source": {
     "osmTags": "amenity=ticket_validator"
@@ -15,7 +17,8 @@
   "title": {
     "render": {
       "en": "Ticket Validator",
-      "de": "Fahrkartenentwerter"
+      "de": "Fahrkartenentwerter",
+      "ca": "Validador de bitllets"
     }
   },
   "tagRenderings": [
@@ -26,14 +29,16 @@
       "condition": "barrier~*",
       "render": {
         "en": "This ticket validator is part of a barrier of type {barrier}",
-        "de": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}"
+        "de": "Dieser Fahrkartenentwerter ist Teil einer Zugangsbarriere vom Typ {barrier}",
+        "ca": "Aquest validador de bitllets forma part d'una barrera de tipus {barrier}"
       },
       "mappings": [
         {
           "if": "barrier=gate",
           "then": {
             "en": "This ticket validator is part of a gate",
-            "de": "Dieser Fahrscheinentwerter ist Teil einer Zugangsbarriere"
+            "de": "Dieser Fahrscheinentwerter ist Teil einer Zugangsbarriere",
+            "ca": "Aquest validador de bitllets forma part d'una porta"
           }
         }
       ]
@@ -42,11 +47,13 @@
       "id": "validator-operator",
       "question": {
         "en": "Who is the operator of this ticket validator?",
-        "de": "Wer ist der Betreiber dieses Fahrkartenentwerters?"
+        "de": "Wer ist der Betreiber dieses Fahrkartenentwerters?",
+        "ca": "Qui és l'operador d'aquest validador de bitllets?"
       },
       "render": {
         "en": "This ticket validator is operated by {operator}",
-        "de": "Dieser Fahrkartenentwerter wird betrieben von {operator}"
+        "de": "Dieser Fahrkartenentwerter wird betrieben von {operator}",
+        "ca": "{operator} opera aquest validador de bitllets"
       },
       "freeform": {
         "key": "operator",
@@ -54,7 +61,8 @@
         "placeholder": {
           "en": "Name of the operator",
           "de": "Name des Betreibers",
-          "nl": "Naam van de beheerder"
+          "nl": "Naam van de beheerder",
+          "ca": "Nom de l'operador"
         }
       },
       "mappings": [
@@ -63,7 +71,8 @@
           "then": {
             "en": "Dutch Railways (NS)",
             "nl": "Nederlandse Spoorwegen (NS)",
-            "de": "Niederländische Eisenbahn (NS)"
+            "de": "Niederländische Eisenbahn (NS)",
+            "ca": "Ferrocarrils holandesos (NS)"
           },
           "addExtraTags": [
             "operator:wikidata=Q23076"
@@ -81,7 +90,8 @@
             "ifnot": "payment:OV-Chipkaart=no",
             "then": {
               "en": "This ticket validator accepts OV-Chipkaart",
-              "de": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart"
+              "de": "Dieser Fahrkartenentwerter akzeptiert die OV-Chipkaart",
+              "ca": "Aquest validador de bitllets accepta OV-Chipkaart"
             },
             "hideInAnswer": true
           },
@@ -90,7 +100,8 @@
             "ifnot": "payment:ov-chipkaart=no",
             "then": {
               "en": "This ticket validator accepts OV-Chipkaart",
-              "de": "Dieser Ticketentwerter akzeptiert die OV-Chipkaart"
+              "de": "Dieser Ticketentwerter akzeptiert die OV-Chipkaart",
+              "ca": "Aquest validador de bitllets accepta OV-Chipkaart"
             },
             "hideInAnswer": "_country!=nl"
           }
@@ -105,11 +116,13 @@
       ],
       "title": {
         "en": "a ticket validator",
-        "de": "einen Fahrkartenentwerter"
+        "de": "einen Fahrkartenentwerter",
+        "ca": "un validador de bitllets"
       },
       "description": {
         "en": "A ticket validator to validate a public transport ticket. This can be either a digital reader, reading a card or ticket, or a machine stamping or punching a ticket.",
-        "de": "Ein Fahrkartenentwerter zur Entwertung einer Fahrkarte für öffentliche Verkehrsmittel. Dabei kann es sich entweder um ein digitales Lesegerät handeln, das eine Karte oder einen Fahrschein liest, oder um eine Maschine, die einen Fahrschein stempelt oder locht."
+        "de": "Ein Fahrkartenentwerter zur Entwertung einer Fahrkarte für öffentliche Verkehrsmittel. Dabei kann es sich entweder um ein digitales Lesegerät handeln, das eine Karte oder einen Fahrschein liest, oder um eine Maschine, die einen Fahrschein stempelt oder locht.",
+        "ca": "Un validador de bitllets per validar un bitllet de transport públic. Pot ser un lector digital, llegir una targeta o un bitllet, o una màquina que estampa o perfora un bitllet."
       }
     }
   ],

assets/layers/toilet/toilet.json

@@ -68,7 +68,8 @@
         "fr": "Toilettes avec au moins un WC accessible aux personnes à mobilité réduite",
         "nl": "Deze toiletten hebben op zijn minst één rolstoeltoegankelijke WC",
         "it": "Servizi igienici che hanno almeno una toilette accessibile a persone in sedia a rotelle",
-        "da": "Et toilet, der har mindst et kørestolsvenligt toilet"
+        "da": "Et toilet, der har mindst et kørestolsvenligt toilet",
+        "ca": "Un lavabo que tingui almenys un lavabo accessible per a cadira de rodes"
       }
     }
   ],
@@ -167,7 +168,8 @@
             "it": "Accesso pubblico",
             "ru": "Свободный доступ",
             "es": "De acceso público",
-            "da": "Offentlig adgang"
+            "da": "Offentlig adgang",
+            "ca": "Accés públic"
           },
           "hideInAnswer": true
         }
@@ -245,7 +247,8 @@
         "placeholder": {
           "en": "e.g. 0.50 EUR",
           "nl": "bijv. 0.50 EUR",
-          "de": "z.B. 0.50 EUR"
+          "de": "z.B. 0.50 EUR",
+          "ca": "p. ex. 0.50 eur"
         }
       },
       "id": "toilet-charge"
@@ -265,7 +268,8 @@
           "nl": "Wanneer zijn deze toiletten open?",
           "de": "Wann sind diese Toiletten geöffnet?",
           "fr": "Quand ces toilettes sont-elles ouvertes ?",
-          "da": "Hvornår åbnes disse toiletter?"
+          "da": "Hvornår åbnes disse toiletter?",
+          "ca": "Quan obrin aquests lavabos?"
         }
       }
     },
@@ -341,7 +345,8 @@
         "nl": "De deur naar de rolstoeltoegankelijke toilet is {canonical(door:width)} wide",
         "fr": "La porte des toilettes accessibles aux fauteuils roulants a une large de {canonical(door:width)}",
         "de": "Die Tür zur rollstuhlgerechten Toilette ist {canonical(door:width)} breit",
-        "da": "Døren til det kørestolsvenlige toilet er {canonical(door:width)} bred"
+        "da": "Døren til det kørestolsvenlige toilet er {canonical(door:width)} bred",
+        "ca": "La porta del vàter accessible amb cadira de rodes té {canonical(door:width)} d'ample"
       },
       "freeform": {
         "key": "door:width",
@@ -461,7 +466,8 @@
         "nl": "Waar bevindt de luiertafel zich?",
         "it": "Dove si trova il fasciatoio?",
         "es": "¿Dónde está el cambiador?",
-        "da": "Hvor er puslebordet placeret?"
+        "da": "Hvor er puslebordet placeret?",
+        "ca": "On està el canviador?"
       },
       "render": {
         "en": "The changing table is located at {changing_table:location}",
@@ -470,7 +476,8 @@
         "nl": "De luiertafel bevindt zich in {changing_table:location}",
         "it": "Il fasciatoio si trova presso {changing_table:location}",
         "es": "El cambiador está en {changing_table:location}",
-        "da": "Puslebordet er placeret på {changing_table:location}"
+        "da": "Puslebordet er placeret på {changing_table:location}",
+        "ca": "El cambiador està a {changing_table:location}"
       },
       "condition": "changing_table=yes",
       "freeform": {
@@ -485,7 +492,8 @@
             "fr": "La table à langer est dans les toilettes pour femmes. ",
             "nl": "De luiertafel bevindt zich in de vrouwentoiletten ",
             "it": "Il fasciatoio è nei servizi igienici femminili. ",
-            "da": "Puslebordet er på toilettet til kvinder. "
+            "da": "Puslebordet er på toilettet til kvinder. ",
+            "ca": "El canviador està al lavabo per a dones. "
           },
           "if": "changing_table:location=female_toilet"
         },
@@ -495,7 +503,8 @@
             "de": "Der Wickeltisch befindet sich in der Herrentoilette. ",
             "fr": "La table à langer est dans les toilettes pour hommes. ",
             "nl": "De luiertafel bevindt zich in de herentoiletten ",
-            "it": "Il fasciatoio è nei servizi igienici maschili. "
+            "it": "Il fasciatoio è nei servizi igienici maschili. ",
+            "ca": "El canviador està al lavabo per a homes. "
           },
           "if": "changing_table:location=male_toilet"
         },
@@ -507,7 +516,8 @@
             "fr": "La table à langer est dans les toilettes pour personnes à mobilité réduite. ",
             "nl": "De luiertafel bevindt zich in de rolstoeltoegankelijke toilet ",
             "it": "Il fasciatoio è nei servizi igienici per persone in sedia a rotelle. ",
-            "da": "Puslebordet er på toilettet for kørestolsbrugere. "
+            "da": "Puslebordet er på toilettet for kørestolsbrugere. ",
+            "ca": "El canviador està al lavabo per a usuaris de cadira de rodes. "
           }
         },
         {
@@ -519,7 +529,8 @@
             "nl": "De luiertafel bevindt zich in een daartoe voorziene kamer ",
             "it": "Il fasciatoio è in una stanza dedicata. ",
             "es": "El cambiador está en una habitación dedicada ",
-            "da": "Vuggestuen står i et særligt rum. "
+            "da": "Vuggestuen står i et særligt rum. ",
+            "ca": "El canviador està en una habitació dedicada. "
           }
         }
       ],
@@ -620,7 +631,8 @@
             "de": "Barrierefrei",
             "es": "Accesible con sillas de ruedas",
             "fr": "Accessible aux fauteuils roulants",
-            "da": "Tilgængelig for kørestolsbrugere"
+            "da": "Tilgængelig for kørestolsbrugere",
+            "ca": "Accessible amb cadira de rodes"
           },
           "osmTags": {
             "or": [
@@ -641,7 +653,8 @@
             "de": "Mit Wickeltisch",
             "es": "Tiene un cambiador",
             "fr": "A une table à langer",
-            "da": "Har et puslebord"
+            "da": "Har et puslebord",
+            "ca": "Té un canviador"
           },
           "osmTags": "changing_table=yes"
         }
@@ -706,7 +719,8 @@
     "de": "Eine Ebene mit (öffentlichen) Toiletten",
     "es": "Una capa que muestra baños (públicos)",
     "fr": "Un calque montrant les toilettes (publiques)",
-    "da": "Et lag, der viser (offentlige) toiletter"
+    "da": "Et lag, der viser (offentlige) toiletter",
+    "ca": "Una capa que mostra banys (publics)"
   },
   "units": [
     {
@@ -725,7 +739,8 @@
             "fr": "mètre",
             "de": "Meter",
             "da": "meter",
-            "pa_PK": "میٹر"
+            "pa_PK": "میٹر",
+            "ca": "metre"
           }
         },
         {
@@ -740,7 +755,8 @@
             "fr": "centimètre",
             "de": "Zentimeter",
             "da": "centimeter",
-            "pa_PK": "سینٹیمیٹر"
+            "pa_PK": "سینٹیمیٹر",
+            "ca": "centimetre"
           }
         }
       ]

assets/layers/toilet_at_amenity/toilet_at_amenity.json

@@ -44,7 +44,8 @@
         "nl": "Toegankelijkheid is {toilets:access}",
         "it": "L'accesso è {toilets:access}",
         "es": "El acceso es {toilets:access}",
-        "da": "Adgang er {toilets:access}"
+        "da": "Adgang er {toilets:access}",
+        "ca": "L'accés és {toilets:access}"
       },
       "freeform": {
         "key": "toilets:access",
@@ -63,7 +64,8 @@
             "it": "Accesso pubblico",
             "ru": "Свободный доступ",
             "es": "Acceso públic",
-            "da": "Offentlig adgang"
+            "da": "Offentlig adgang",
+            "ca": "Accés públic"
           }
         },
         {
@@ -82,7 +84,8 @@
             "en": "Not accessible, even for customers of the amenity",
             "de": "Nicht zugänglich, auch nicht für Kunden der Einrichtung",
             "nl": "Niet toegankelijk, ook niet voor klanten van de voorziening",
-            "fr": "Non accessibles, même pour les clients du lieu"
+            "fr": "Non accessibles, même pour les clients du lieu",
+            "ca": "No accessible, inclús per als clients de la instal·lació"
           }
         },
         {
@@ -94,7 +97,8 @@
             "nl": "Toegankelijk na het vragen van de sleutel",
             "it": "Accessibile, ma occorre chiedere una chiave per accedere",
             "es": "Accesible, pero hay que pedir la llave para entrar",
-            "da": "Tilgængelig, men man skal bede om en nøgle for at komme ind"
+            "da": "Tilgængelig, men man skal bede om en nøgle for at komme ind",
+            "ca": "Accessible, però hi ha que demanar la clau per a entrar"
           }
         },
         {
@@ -107,7 +111,8 @@
             "it": "Accesso pubblico",
             "ru": "Свободный доступ",
             "es": "De acceso público",
-            "da": "Offentlig adgang"
+            "da": "Offentlig adgang",
+            "ca": "Accés públic"
           },
           "hideInAnswer": true
         }
@@ -164,7 +169,8 @@
         "it": "Quanto costa l'accesso a questi servizi igienici?",
         "ru": "Сколько стоит посещение туалета?",
         "es": "¿Cuánto hay que pagar para estos baños?",
-        "da": "Hvor meget skal man betale for disse toiletter?"
+        "da": "Hvor meget skal man betale for disse toiletter?",
+        "ca": "Quant s'ha de pagar per aquests lavabos?"
       },
       "render": {
         "en": "The fee is {toilets:charge}",
@@ -174,7 +180,8 @@
         "it": "La tariffa è {toilets:charge}",
         "ru": "Стоимость {toilets:charge}",
         "es": "La tasa es {toilets:charge}",
-        "da": "Gebyret er {toilets:charge}"
+        "da": "Gebyret er {toilets:charge}",
+        "ca": "La taxa és {toilets:charge}"
       },
       "condition": "toilets:fee=yes",
       "freeform": {
@@ -298,7 +305,8 @@
             "de": "Barrierefrei",
             "es": "Accesible con sillas de ruedas",
             "fr": "Accessible aux fauteuils roulants",
-            "da": "Tilgængelig for kørestolsbrugere"
+            "da": "Tilgængelig for kørestolsbrugere",
+            "ca": "Accessible amb cadira de rodes"
           },
           "osmTags": {
             "or": [
@@ -426,7 +434,8 @@
   "description": {
     "en": "A layer showing (public) toilets located at different places.",
     "de": "Eine Ebene mit (öffentlichen) Toiletten an verschiedenen Orten.",
-    "nl": "Een laag die (publiek toegankelijke) toiletten toont in verschillende andere voorzieningen."
+    "nl": "Een laag die (publiek toegankelijke) toiletten toont in verschillende andere voorzieningen.",
+    "ca": "Una capa que mostra banys (públics) ubicats en diferents llocs"
   },
   "units": [
     {

assets/layers/transit_routes/transit_routes.json

@@ -157,7 +157,8 @@
         "en": "What is the colour for this bus line?",
         "de": "Welche Farbe hat diese Buslinie?",
         "nl": "Wat is de kleur van deze buslijn?",
-        "da": "Hvad er farven på denne buslinje?"
+        "da": "Hvad er farven på denne buslinje?",
+        "ca": "Quin és el color d'aquest línia d'autobús?"
       }
     },
     {
@@ -199,7 +200,8 @@
         "en": "What company operates this bus line?",
         "de": "Welches Unternehmen betreibt die Buslinie?",
         "nl": "Welk bedrijf exploiteert deze buslijn?",
-        "da": "Hvilket selskab driver denne buslinje?"
+        "da": "Hvilket selskab driver denne buslinje?",
+        "ca": "Quina companyia opera aquesta línia d'autobús?"
       }
     }
   ]

assets/layers/tree_node/tree_node.json

@@ -88,7 +88,8 @@
         "fr": "Quelle est l'espèce de cet arbre ?",
         "da": "Hvilken art er dette træ?",
         "pt": "Que espécie é esta árvore?",
-        "pt_BR": "Que espécie é esta árvore?"
+        "pt_BR": "Que espécie é esta árvore?",
+        "ca": "Quina espècie és aquest arbre?"
       },
       "render": {
         "*": "{wikipedia(species:wikidata):max-height: 25rem}"
@@ -343,7 +344,8 @@
         "fr": "Cet arbre est-il un feuillu ou un résineux ?",
         "de": "Ist dies ein Laub- oder Nadelbaum?",
         "es": "¿Es un árbol de hoja ancha o de hoja aguja?",
-        "pt": "Esta é uma árvore de folhas largas ou acículas?"
+        "pt": "Esta é uma árvore de folhas largas ou acículas?",
+        "ca": "És un arbre de fulla ampla o d'agulla?"
       },
       "mappings": [
         {
@@ -405,7 +407,8 @@
             "es": "Permanentemente sin hojas",
             "id": "Tanpa daun permanen",
             "da": "Permanent bladløs",
-            "pt": "permanentemente sem folhas"
+            "pt": "permanentemente sem folhas",
+            "ca": "Permanentment sense fulles"
           },
           "hideInAnswer": true,
           "icon": {
@@ -494,7 +497,8 @@
         "eo": "Nomo: {name}",
         "es": "Nombre: {name}",
         "da": "Navn: {name}",
-        "pt": "Nome: {name}"
+        "pt": "Nome: {name}",
+        "ca": "Nom : {name}"
       },
       "question": {
         "nl": "Heeft de boom een naam?",
@@ -506,7 +510,8 @@
         "es": "¿Tiene nombre este árbol?",
         "id": "Apakah pohon ini memiliki nama?",
         "da": "Har træet et navn?",
-        "pt": "A árvore tem nome?"
+        "pt": "A árvore tem nome?",
+        "ca": "Té nom aquest arbre?"
       },
       "freeform": {
         "key": "name",
@@ -529,10 +534,11 @@
             "fr": "L'arbre n'a pas de nom.",
             "ru": "У этого дерева нет названия.",
             "de": "Der Baum hat keinen Namen.",
-            "es": "No identificas la especie.",
+            "es": "El árbol no tiene nombre.",
             "id": "Pohon ini tidak memiliki nama.",
             "da": "Træet har ikke et navn.",
-            "pt": "A árvore não tem nome."
+            "pt": "A árvore não tem nome.",
+            "ca": "L'arbre no té nom."
           }
         }
       ],
@@ -556,7 +562,8 @@
         "es": "¿Este árbol es patrimonio registrado?",
         "id": "Apakah pohon ini merupakan warisan yang terdaftar?",
         "da": "Er dette træ registreret som kulturarv?",
-        "pt": "Esta árvore é patrimônio tombado?"
+        "pt": "Esta árvore é patrimônio tombado?",
+        "ca": "Aquest arbre és patrimoni registrat?"
       },
       "mappings": [
         {
@@ -597,7 +604,8 @@
             "es": "Registrado como patrimonio por la <i>Dirección de Patrimonio Cultural</i> de Bruselas",
             "id": "Terdaftar sebagai warisan budaya oleh <i>Direction du Patrimoine culturel</i> Brussels",
             "da": "Registreret som kulturarv af <i>Direction du Patrimoine culturel</i> Bruxelles",
-            "pt": "Registrado como patrimônio por <i>Direction du Patrimoine culturel</i> Brussels"
+            "pt": "Registrado como patrimônio por <i>Direction du Patrimoine culturel</i> Brussels",
+            "ca": "Registrat com a patrimoni per la <i>Direction du Patrimoine culturel</i> Brussel·les"
           }
         },
         {
@@ -655,7 +663,8 @@
             "es": "Registrado como patrimonio por un organización diferente",
             "id": "Terdaftar sebagai warisan oleh organisasi yang berbeda",
             "da": "Registreret som kulturarv af en anden organisation",
-            "pt": "Registrado como patrimônio por uma organização diferente"
+            "pt": "Registrado como patrimônio por uma organização diferente",
+            "ca": "Registrat com a patrimoni per una organització diferent"
           },
           "hideInAnswer": true
         }
@@ -675,7 +684,8 @@
         "ru": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
         "fr": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Identifiant Onroerend Erfgoed : <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
         "de": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed Kennung: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-        "da": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
+        "da": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
+        "ca": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/>Identifiació Onroerend Erfgoed: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
       },
       "question": {
         "nl": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?",
@@ -685,7 +695,8 @@
         "de": "Wie lautet die Kennung der Onroerend Erfgoed Flanders?",
         "es": "¿Cuál es el número de identificación emitido por Onroerend Erfgoed Flandes?",
         "da": "Hvad er ID udstedt af Onroerend Erfgoed Flanders?",
-        "pt": "Qual é o ID emitido por Onroerend Erfgoed Flanders?"
+        "pt": "Qual é o ID emitido por Onroerend Erfgoed Flanders?",
+        "ca": "Quina és la identificació emesa per Onroerend Erfgoed Flanders?"
       },
       "freeform": {
         "key": "ref:OnroerendErfgoed",
@@ -708,7 +719,8 @@
         "fr": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata : <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
         "de": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
         "es": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
-        "da": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
+        "da": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/> Wikidata: <a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>",
+        "ca": "<img src=\"./assets/svg/wikidata.svg\" style=\"width:1em;height:0.56em;vertical-align:middle\" alt=\"\"/>Wikidata<a href=\"http://www.wikidata.org/entity/{wikidata}\">{wikidata}</a>"
       },
       "question": {
         "nl": "Wat is het Wikidata-ID van deze boom?",
@@ -718,7 +730,8 @@
         "de": "Was ist das passende Wikidata Element zu diesem Baum?",
         "es": "¿Cuál es el ID de Wikidata para este árbol?",
         "da": "Hvad er Wikidata-id'et for dette træ?",
-        "pt": "Qual é o ID do Wikidata para esta árvore?"
+        "pt": "Qual é o ID do Wikidata para esta árvore?",
+        "ca": "Quin és l'identificador de Wikidata d'aquest arbre?"
       },
       "freeform": {
         "key": "wikidata",

assets/layers/usersettings/usersettings.json

@@ -4,7 +4,8 @@
     "en": "A special layer which is not meant to be shown on a map, but which is used to set user settings",
     "de": "Eine spezielle Ebene, die nicht für die Darstellung auf einer Karte gedacht ist, sondern für die Festlegung von Benutzereinstellungen verwendet wird",
     "nl": "Een speciale lag die niet getoond wordt op de kaart, maar die de instellingen van de gebruiker weergeeft",
-    "pt": "Uma camada especial que não deve ser mostrada em um mapa, mas que é usada para definir as configurações do usuário"
+    "pt": "Uma camada especial que não deve ser mostrada em um mapa, mas que é usada para definir as configurações do usuário",
+    "ca": "Una capa especial que no està pensada per mostrar-se en un mapa, però que s'utilitza per configurar la configuració de l'usuari"
   },
   "title": {
     "render": {
@@ -12,7 +13,8 @@
       "nl": "Instellingen",
       "de": "Einstellungen",
       "fr": "Paramètres",
-      "da": "Indstillinger"
+      "da": "Indstillinger",
+      "ca": "Configuració"
     }
   },
   "source": "special",
@@ -41,7 +43,8 @@
           "icon": "./assets/layers/usersettings/translate_disabled.svg",
           "then": {
             "en": "The language was set via an URL-parameter and cannot be set by the user.²",
-            "de": "Die Sprache wurde über einen URL-Parameter gesetzt und kann nicht vom Benutzer eingestellt werden.²"
+            "de": "Die Sprache wurde über einen URL-Parameter gesetzt und kann nicht vom Benutzer eingestellt werden.²",
+            "ca": "L'idioma es va establir mitjançant un paràmetre d'URL i l'usuari no pot definir-lo.²"
           }
         }
       ]
@@ -58,7 +61,8 @@
               "text": {
                 "en": "Open your inbox",
                 "nl": "Ga naar je inbox",
-                "de": "Deinen Posteingang öffnen"
+                "de": "Deinen Posteingang öffnen",
+                "ca": "Obre la teva safata d'entrada"
               }
             }
           }
@@ -70,7 +74,8 @@
               "type": "link",
               "text": {
                 "en": "<b class='alert'>You have {_unreadMessages}</b><br/>Open your inbox",
-                "de": "<b class='alert'>Du hast {_unreadMessages}</b><br/>Öffne Deinen Posteingang"
+                "de": "<b class='alert'>Du hast {_unreadMessages}</b><br/>Öffne Deinen Posteingang",
+                "ca": "<b class='alert'>Tens {_unreadMessages}</b><br/>Open your inbox"
               },
               "href": "{_backend}/messages/inbox"
             }
@@ -85,7 +90,8 @@
           "type": "link",
           "text": {
             "en": "Open your settings on OpenStreetMap.org",
-            "de": "Öffne Deine Einstellungen auf OpenStreetMap.org"
+            "de": "Öffne Deine Einstellungen auf OpenStreetMap.org",
+            "ca": "Obriu la vostra configuració a OpenStreetMap.org"
           },
           "href": "{_backend}/account/edit"
         }
@@ -164,32 +170,37 @@
       "question": {
         "en": "Show the raw OpenStreetMap-tags?",
         "de": "Rohe OpenStreetMap-Tags anzeigen?",
-        "fr": "Afficher les attributs OpenStreetMap bruts ?"
+        "fr": "Afficher les attributs OpenStreetMap bruts ?",
+        "ca": "Mostra les etiquetes d'OpenStreetMap en brut?"
       },
       "questionHint": {
         "en": "<b>Tags</b> are attributes that every element has. This is the technical data that is stored in the database. You don't need this information to edit with MapComplete, but advanced users might want to use this as reference.",
-        "de": "<b>Tags</b> sind die Eigenschaften, die jedes Objekt hat. Das sind die technischen Daten, die in der Datenbank gespeichert werden. Du brauchst diese Informationen nicht, um mit MapComplete Änderungen zu machen, aber fortgeschrittenen Nutzer*innen kann es als Referenz dienen."
+        "de": "<b>Tags</b> sind die Eigenschaften, die jedes Objekt hat. Das sind die technischen Daten, die in der Datenbank gespeichert werden. Du brauchst diese Informationen nicht, um mit MapComplete Änderungen zu machen, aber fortgeschrittenen Nutzer*innen kann es als Referenz dienen.",
+        "ca": "Les <b>etiquetes</b> són atributs que té cada element. Aquestes són les dades tècniques que s'emmagatzemen a la base de dades. No necessiteu aquesta informació per editar amb MapComplete, però és possible que els usuaris avançats la vulguin fer servir com a referència."
       },
       "mappings": [
         {
           "if": "mapcomplete-show_tags=no",
           "then": {
             "en": "Never show the tags.",
-            "de": "Tags nie anzeigen."
+            "de": "Tags nie anzeigen.",
+            "ca": "No mostris mai les etiquetes."
           }
         },
         {
           "if": "mapcomplete-show_tags=",
           "then": {
             "en": "Show the tags that will be applied once I have made {__userjourney_tagsVisibleAt} changesets",
-            "de": "Tags anzeigen sobald ich {__userjourney_tagsVisibleAt} Changesets erstellt habe"
+            "de": "Tags anzeigen sobald ich {__userjourney_tagsVisibleAt} Changesets erstellt habe",
+            "ca": "Mostra les etiquetes que s'aplicaran un cop hagi fet {__userjourney_tagsVisibleAt} conjunts de canvis"
           }
         },
         {
           "if": "mapcomplete-show_tags=yes",
           "then": {
             "en": "Show the tags that will be applied when making a change",
-            "de": "Tags anzeigen, die bei der Änderung hinzugefügt werden"
+            "de": "Tags anzeigen, die bei der Änderung hinzugefügt werden",
+            "ca": "Mostra les etiquetes que s'aplicaran en fer un canvi"
           }
         },
         {
@@ -208,7 +219,8 @@
         "en": "Should questions for unknown data fields appear one-by-one or together?",
         "de": "Sollen Fragen für unbekannte Datenfelder einzeln oder zusammen angezeigt werden?",
         "fr": "Est-ce que les questions pour les champs sans donnée doivent apparaître une à une ou toutes ensembles ?",
-        "pt": "As perguntas para campos de dados desconhecidos devem aparecer uma a uma ou juntas?"
+        "pt": "As perguntas para campos de dados desconhecidos devem aparecer uma a uma ou juntas?",
+        "ca": "Les preguntes amb camps de dades desconeguts haurien d'aparèixer una per una o juntes?"
       },
       "mappings": [
         {
@@ -238,7 +250,8 @@
       "id": "fixate-north",
       "question": {
         "en": "Should north always be up?",
-        "de": "Soll Norden immer oben sein?"
+        "de": "Soll Norden immer oben sein?",
+        "ca": "El nord hauria d'estar sempre amunt?"
       },
       "mappings": [
         {
@@ -256,7 +269,8 @@
           "then": {
             "en": "Always keep north pointing up",
             "de": "Norden immer nach oben zeigen lassen",
-            "fr": "Toujours garder le nord en haut"
+            "fr": "Toujours garder le nord en haut",
+            "ca": "Mantingueu sempre el nord apuntant cap amunt"
           }
         }
       ]
@@ -271,13 +285,15 @@
           "text": {
             "en": "Download the private key for your Mangrove Account",
             "de": "Laden Sie den privaten Schlüssel für Ihr Mangrove-Konto herunter",
-            "da": "Hent den private nøgle til din Mangrove-konto"
+            "da": "Hent den private nøgle til din Mangrove-konto",
+            "ca": "Baixeu la clau privada del vostre compte de Mangrove"
           }
         },
         "after": {
           "en": "Anyone possessing this file can make reviews with your identity",
           "de": "Jeder, der diese Datei besitzt, kann mit Ihrer Identität Rezensionen vornehmen",
-          "da": "Enhver, der har denne fil, kan lave ændringer med din identitet"
+          "da": "Enhver, der har denne fil, kan lave ændringer med din identitet",
+          "ca": "Qualsevol persona que tingui aquest fitxer pot fer ressenyes amb la vostra identitat"
         }
       }
     },
@@ -447,7 +463,8 @@
           "then": {
             "en": "We found a link to what looks to be a mastodon account, but it is unverified. <a href='https://www.openstreetmap.org/profile/edit' target='_blank' rel='noopener'>Edit your profile description</a> and place the following there: <span class='code'>&lta href=\"{_mastodon_candidate}\" rel=\"me\"&gtMastodon&lt/a&gt",
             "de": "Wir haben einen Link gefunden, der aussieht wie ein Mastodon-Konto, aber nicht verifiziert ist. <a href='https://www.openstreetmap.org/profile/edit' target='_blank' rel='noopener'>Bearbeiten Sie Ihre Profilbeschreibung</a> und fügen Sie dort Folgendes ein: <span class='code'>&lta href=\"{_mastodon_candidate}\" rel=\"me\"&gtMastodon&lt/a&gt",
-            "nl": "Je profielbeschrijving bevat een link die vermoedelijk naar je Mastodon gaat, maar deze link is niet verifieerdbaar voor Mastodon.<a href='https://www.openstreetmap.org/profile/edit' target='_blank' rel='noopener'>Pas je profielbeschrijving aan</a> en plaats er de volgende code: <span class='code'>&lta href=\"{_mastodon_candidate}\" rel=\"me\"&gtMastodon&lt/a&gt"
+            "nl": "Je profielbeschrijving bevat een link die vermoedelijk naar je Mastodon gaat, maar deze link is niet verifieerdbaar voor Mastodon.<a href='https://www.openstreetmap.org/profile/edit' target='_blank' rel='noopener'>Pas je profielbeschrijving aan</a> en plaats er de volgende code: <span class='code'>&lta href=\"{_mastodon_candidate}\" rel=\"me\"&gtMastodon&lt/a&gt",
+            "ca": "Hem trobat un enllaç al que sembla ser un compte de mastodon, però no està verificat. <a href='https://www.openstreetmap.org/profile/edit' target='_blank' rel='noopener'>Editeu la descripció del vostre perfil</a> i col·loqueu-hi el següent: <span class='code '>&lta href=\"{_mastodon_candidate}\" rel=\"me\"&gtMastodon&lt/a&gt"
           },
           "icon": "invalid"
         }
@@ -541,7 +558,8 @@
             "de": "Keine Debug-Informationen anzeigen",
             "cs": "Nezobrazovat informace o ladění",
             "pt": "Não mostrar informações de depuração",
-            "da": "Vis ikke debug-informationer"
+            "da": "Vis ikke debug-informationer",
+            "ca": "No mostris informació de depuració"
           },
           "hideInAnswer": true
         }

assets/layers/vending_machine/vending_machine.json

@@ -4,13 +4,15 @@
     "en": "Vending Machines",
     "nl": "Verkoopautomaten",
     "de": "Verkaufsautomaten",
-    "fr": "Distributeurs"
+    "fr": "Distributeurs",
+    "ca": "Màquines expenedores"
   },
   "description": {
     "en": "Layer showing vending machines",
     "nl": "Laag met verkoopautomaten",
     "de": "Ebene mit Verkaufsautomaten",
-    "fr": "Couche affichant les distributeurs"
+    "fr": "Couche affichant les distributeurs",
+    "ca": "Capa que mostra màquines expenedores"
   },
   "source": {
     "osmTags": {
@@ -25,7 +27,8 @@
       "en": "Vending machine",
       "nl": "Verkoopautomaat",
       "de": "Verkaufsautomat",
-      "fr": "Distributeur"
+      "fr": "Distributeur",
+      "ca": "Màquina expenedora"
     },
     "mappings": [
       {
@@ -34,7 +37,8 @@
           "en": "Vending machine {name}",
           "nl": "Verkoopautomaat {name}",
           "de": "Verkaufsautomat {name}",
-          "fr": "Distributeur {name}"
+          "fr": "Distributeur {name}",
+          "ca": "Maquina expenedora {name}"
         }
       },
       {
@@ -43,7 +47,8 @@
           "en": "Vending machine {brand}",
           "nl": "Verkoopautomaat {brand}",
           "de": "Verkaufsautomat {brand}",
-          "fr": "Distributeur {brand}"
+          "fr": "Distributeur {brand}",
+          "ca": "Màquina expenedora {brand}"
         }
       }
     ]
@@ -56,7 +61,8 @@
         "en": "What does this vending machine sell?",
         "nl": "Wat verkoopt deze verkoopautomaat?",
         "de": "Was wird in diesem Automaten verkauft?",
-        "fr": "Que vent ce distributeur ?"
+        "fr": "Que vent ce distributeur ?",
+        "ca": "Que ven aquesta màquina expenedora?"
       },
       "freeform": {
         "key": "vending",
@@ -68,7 +74,8 @@
         "en": "This vending machine sells {vending}",
         "nl": "Deze verkoopautomaat verkoopt {vending}",
         "de": "Dieser Automat verkauft {vending}",
-        "fr": "Ce distributeur vent {vending}"
+        "fr": "Ce distributeur vent {vending}",
+        "ca": "Aquesta màquina expenedora ven {vending}"
       },
       "mappings": [
         {
@@ -77,7 +84,8 @@
             "en": "Drinks are sold",
             "nl": "Dranken worden verkocht",
             "de": "Getränke werden verkauft",
-            "fr": "Vent des boissons"
+            "fr": "Vent des boissons",
+            "ca": "Es venen begudes"
           },
           "icon": "./assets/layers/id_presets/temaki-bottles.svg"
         },
@@ -87,7 +95,8 @@
             "en": "Sweets are sold",
             "nl": "Snoep wordt verkocht",
             "de": "Süßigkeiten werden verkauft",
-            "fr": "Vent des confiseries"
+            "fr": "Vent des confiseries",
+            "ca": "Es venen llaminadures"
           },
           "icon": "./assets/layers/id_presets/maki-confectionery.svg"
         },
@@ -97,7 +106,8 @@
             "en": "Food is sold",
             "nl": "Eten wordt verkocht",
             "de": "Lebensmittel werden verkauft",
-            "fr": "Vent de la nourriture"
+            "fr": "Vent de la nourriture",
+            "ca": "Es ven menjar"
           },
           "icon": "./assets/layers/vending_machine/utensils.svg"
         },
@@ -107,7 +117,8 @@
             "en": "Cigarettes are sold",
             "nl": "Sigaretten worden verkocht",
             "de": "Zigaretten werden verkauft",
-            "fr": "Vent des cigarettes"
+            "fr": "Vent des cigarettes",
+            "ca": "Es ven tabaco"
           },
           "icon": "./assets/layers/vending_machine/smoking.svg"
         },
@@ -117,7 +128,8 @@
             "en": "Condoms are sold",
             "nl": "Condooms worden verkocht",
             "de": "Kondome werden verkauft",
-            "fr": "Vent des préservatifs"
+            "fr": "Vent des préservatifs",
+            "ca": "Es venen preservatius"
           }
         },
         {
@@ -126,7 +138,8 @@
             "en": "Coffee is sold",
             "nl": "Koffie wordt verkocht",
             "de": "Kaffee wird verkauft",
-            "fr": "Vent du café"
+            "fr": "Vent du café",
+            "ca": "Es ven cafè"
           },
           "icon": "./assets/layers/vending_machine/mug-saucer.svg"
         },
@@ -136,7 +149,8 @@
             "en": "Drinking water is sold",
             "nl": "Drinkwater wordt verkocht",
             "de": "Trinkwasser wird verkauft",
-            "fr": "Vent de l'eau"
+            "fr": "Vent de l'eau",
+            "ca": "Es ven aigua"
           },
           "icon": "./assets/layers/id_presets/temaki-water_bottle.svg"
         },
@@ -146,7 +160,8 @@
             "en": "Newspapers are sold",
             "nl": "Kranten worden verkocht",
             "de": "Zeitungen werden verkauft",
-            "fr": "Vent des journaux"
+            "fr": "Vent des journaux",
+            "ca": "Es venen diaris"
           },
           "icon": "./assets/layers/id_presets/fas-newspaper.svg"
         },
@@ -156,7 +171,8 @@
             "en": "Bicycle inner tubes are sold",
             "nl": "Binnenbanden voor fietsen worden verkocht",
             "de": "Fahrradschläuche werden verkauft",
-            "fr": "Vent des chambres à air pour vélo"
+            "fr": "Vent des chambres à air pour vélo",
+            "ca": "Es venen càmeres interiors de bicicletes"
           }
         },
         {
@@ -165,7 +181,8 @@
             "en": "Milk is sold",
             "nl": "Melk wordt verkocht",
             "de": "Milch wird verkauft",
-            "fr": "Vent du lait"
+            "fr": "Vent du lait",
+            "ca": "Es ven llet"
           },
           "icon": "./assets/layers/vending_machine/cow.svg"
         },
@@ -175,7 +192,8 @@
             "en": "Bread is sold",
             "nl": "Brood wordt verkocht",
             "de": "Brot wird verkauft",
-            "fr": "Vent du pain"
+            "fr": "Vent du pain",
+            "ca": "Es ven pa"
           },
           "icon": "./assets/layers/id_presets/maki-bakery.svg"
         },
@@ -185,7 +203,8 @@
             "en": "Eggs are sold",
             "nl": "Eieren worden verkocht",
             "de": "Eier werden verkauft",
-            "fr": "Vent des œufs"
+            "fr": "Vent des œufs",
+            "ca": "Es venen ous"
           },
           "icon": "./assets/layers/vending_machine/egg.svg"
         },
@@ -195,7 +214,8 @@
             "en": "Cheese is sold",
             "nl": "Kaas wordt verkocht",
             "de": "Käse wird verkauft",
-            "fr": "Vent du fromage"
+            "fr": "Vent du fromage",
+            "ca": "Es ven formatge"
           },
           "icon": "./assets/layers/id_presets/fas-cheese.svg"
         },
@@ -205,7 +225,8 @@
             "en": "Honey is sold",
             "nl": "Honing wordt verkocht",
             "de": "Honig wird verkauft",
-            "fr": "Vent du miel"
+            "fr": "Vent du miel",
+            "ca": "Es ven mel"
           },
           "icon": "./assets/layers/vending_machine/honey.svg"
         },
@@ -215,7 +236,8 @@
             "en": "Potatoes are sold",
             "nl": "Aardappelen worden verkocht",
             "de": "Kartoffeln werden verkauft",
-            "fr": "Vent des pommes de terre"
+            "fr": "Vent des pommes de terre",
+            "ca": "Es venen papes"
           },
           "icon": "./assets/layers/vending_machine/potato.svg"
         },
@@ -225,7 +247,8 @@
             "en": "Flowers are sold",
             "nl": "Bloemen worden verkocht",
             "de": "Blumen werden verkauft",
-            "fr": "Vent des fleurs"
+            "fr": "Vent des fleurs",
+            "ca": "Es venen flors"
           },
           "icon": "./assets/layers/id_presets/maki-florist.svg"
         },
@@ -234,14 +257,16 @@
           "then": {
             "en": "Parking tickets are sold",
             "nl": "Parkeerkaarten worden verkocht",
-            "de": "Parkscheine werden verkauft"
+            "de": "Parkscheine werden verkauft",
+            "ca": "Es venen tiquets d'aparcament"
           },
           "icon": "./assets/layers/parking_ticket_machine/parking_tickets.svg"
         },
         {
           "if": "vending=elongated_coin",
           "then": {
-            "en": "Pressed pennies are sold"
+            "en": "Pressed pennies are sold",
+            "ca": "Es venen cèntims premsats"
           },
           "icon": "./assets/themes/elongated_coin/penny.svg"
         },
@@ -250,7 +275,8 @@
           "then": {
             "en": "Public transport tickets are sold",
             "nl": "Openbaar vervoerkaartjes worden verkocht",
-            "de": "Fahrscheine werden verkauft"
+            "de": "Fahrscheine werden verkauft",
+            "ca": "Es venen bitllets de transport públic"
           },
           "icon": "./assets/themes/stations/public_transport_tickets.svg"
         }
@@ -267,7 +293,8 @@
         "en": "Who operates this vending machine?",
         "nl": "Wie beheert deze verkoopautomaat?",
         "de": "Wer betreibt diesen Verkaufsautomaten?",
-        "fr": "Qui exploite ce distributeur ?"
+        "fr": "Qui exploite ce distributeur ?",
+        "ca": "Qui opera aquesta màquina expenedora?"
       },
       "freeform": {
         "key": "operator",
@@ -275,14 +302,16 @@
           "en": "Name of operator",
           "nl": "Naam van beheerder",
           "de": "Name des Betreibers",
-          "fr": "Nom de l'exploitant"
+          "fr": "Nom de l'exploitant",
+          "ca": "Nom de l'operadora"
         }
       },
       "render": {
         "en": "This vending machine is operated by {operator}",
         "nl": "Deze verkoopautomaat wordt beheerd door {operator}",
         "de": "Dieser Verkaufsautomat wird betrieben von {operator}",
-        "fr": "Ce distributeur est exploité par {operator}"
+        "fr": "Ce distributeur est exploité par {operator}",
+        "ca": "{operator} gestiona aquesta màquina expenedora"
       }
     },
     {
@@ -291,7 +320,8 @@
         "en": "Is this vending machine indoors?",
         "nl": "Is deze verkoopautomaat binnen?",
         "de": "Ist dieser Automat in einem Gebäude untergebracht?",
-        "fr": "Est-ce que ce distributeur est en intérieur ?"
+        "fr": "Est-ce que ce distributeur est en intérieur ?",
+        "ca": "Aquesta màquina expenedora està a l'exterior?"
       },
       "mappings": [
         {
@@ -300,7 +330,8 @@
             "en": "This vending machine is outdoors",
             "nl": "Deze verkoopautomaat is buiten",
             "de": "Dieser Automat befindet sich im Freien",
-            "fr": "Ce distributeur est à l'extérieur"
+            "fr": "Ce distributeur est à l'extérieur",
+            "ca": "Aquesta màquina expenedora està a l'exterior"
           },
           "hideInAnswer": true
         },
@@ -310,7 +341,8 @@
             "en": "This vending machine is indoors",
             "nl": "Deze verkoopautomaat is binnen",
             "de": "Dieser Verkaufsautomat befindet sich im Innenbereich",
-            "fr": "Ce distributeur est à l'intérieur"
+            "fr": "Ce distributeur est à l'intérieur",
+            "ca": "Aquesta màquina expenedora està a l'interior"
           }
         },
         {
@@ -319,7 +351,8 @@
             "en": "This vending machine is outdoors",
             "nl": "Deze verkoopautomaat is buiten",
             "de": "Dieser Automat befindet sich im Freien",
-            "fr": "Ce distributeur est à l'extérieur"
+            "fr": "Ce distributeur est à l'extérieur",
+            "ca": "Aquesta màquina expenedora està a l'exterior"
           }
         }
       ]
@@ -335,7 +368,8 @@
         "en": "a vending machine",
         "nl": "een verkoopautomaat",
         "de": "ein Verkaufsautomat",
-        "fr": "un distributeur"
+        "fr": "un distributeur",
+        "ca": "una màquina expenedora"
       },
       "tags": [
         "amenity=vending_machine"
@@ -580,7 +614,8 @@
             "en": "All vending machines",
             "nl": "Alle verkoopautomaten",
             "de": "Alle Verkaufsautomaten",
-            "fr": "Tous les distributeurs"
+            "fr": "Tous les distributeurs",
+            "ca": "Totes les màquines expenedores"
           }
         },
         {
@@ -588,7 +623,8 @@
             "en": "Sale of drinks",
             "nl": "Verkoop van dranken",
             "de": "Verkauf von Getränken",
-            "fr": "Vente de boissons"
+            "fr": "Vente de boissons",
+            "ca": "Venda de begudes"
           },
           "osmTags": "vending~i~.*drinks.*"
         },
@@ -597,7 +633,8 @@
             "en": "Sale of sweets",
             "nl": "Verkoop van snoep",
             "de": "Verkauf von Süßigkeiten",
-            "fr": "Ventre de confiseries"
+            "fr": "Ventre de confiseries",
+            "ca": "Venda de llaminadures"
           },
           "osmTags": "vending~i~.*sweets.*"
         },
@@ -606,7 +643,8 @@
             "en": "Sale of food",
             "nl": "Verkoop van eten",
             "de": "Verkauf von Lebensmitteln",
-            "fr": "Ventre de nourriture"
+            "fr": "Ventre de nourriture",
+            "ca": "Venda de menjar"
           },
           "osmTags": "vending~i~.*food.*"
         },
@@ -615,7 +653,8 @@
             "en": "Sale of cigarettes",
             "nl": "Verkoop van sigaretten",
             "de": "Verkauf von Zigaretten",
-            "fr": "Vente de cigarettes"
+            "fr": "Vente de cigarettes",
+            "ca": "Venda de tabaco"
           },
           "osmTags": "vending~i~.*cigarettes.*"
         },
@@ -624,7 +663,8 @@
             "en": "Sale of condoms",
             "nl": "Verkoop van condooms",
             "de": "Verkauf von Kondomen",
-            "fr": "Vente de préservatifs"
+            "fr": "Vente de préservatifs",
+            "ca": "Venda de preservatius"
           },
           "osmTags": "vending~i~.*condoms.*"
         },
@@ -633,7 +673,8 @@
             "en": "Sale of coffee",
             "nl": "Verkoop van koffie",
             "de": "Verkauf von Kaffee",
-            "fr": "Vente de café"
+            "fr": "Vente de café",
+            "ca": "Venda de cafè"
           },
           "osmTags": "vending~i~.*coffee.*"
         },
@@ -642,7 +683,8 @@
             "en": "Sale of water",
             "nl": "Verkoop van water",
             "de": "Verkauf von Trinkwasser",
-            "fr": "Vente d'eau"
+            "fr": "Vente d'eau",
+            "ca": "Venda d'aigua"
           },
           "osmTags": "vending~i~.*water.*"
         },
@@ -651,7 +693,8 @@
             "en": "Sale of newspapers",
             "nl": "Verkoop van kranten",
             "de": "Verkauf von Zeitungen",
-            "fr": "Vente de journaux"
+            "fr": "Vente de journaux",
+            "ca": "Venda de diaris"
           },
           "osmTags": "vending~i~.*newspapers.*"
         },
@@ -660,7 +703,8 @@
             "en": "Sale of bicycle inner tubes",
             "nl": "Verkoop van fietsbinnenbanden",
             "de": "Verkauf von Fahrradschläuchen",
-            "fr": "Vente de chambres à air pour vélo"
+            "fr": "Vente de chambres à air pour vélo",
+            "ca": "Venda de càmeres interiors de bicicletes"
           },
           "osmTags": "vending~i~.*bicycle_tube.*"
         },
@@ -669,7 +713,8 @@
             "en": "Sale of milk",
             "nl": "Verkoop van melk",
             "de": "Verkauf von Milch",
-            "fr": "Vente de lait"
+            "fr": "Vente de lait",
+            "ca": "Venda de llet"
           },
           "osmTags": "vending~i~.*milk.*"
         },
@@ -678,7 +723,8 @@
             "en": "Sale of bread",
             "nl": "Verkoop van brood",
             "de": "Verkauf von Brot",
-            "fr": "Vente de pain"
+            "fr": "Vente de pain",
+            "ca": "Venda de pa"
           },
           "osmTags": "vending~i~.*bread.*"
         },
@@ -687,7 +733,8 @@
             "en": "Sale of eggs",
             "nl": "Verkoop van eieren",
             "de": "Verkauf von Eiern",
-            "fr": "Vente d'œufs"
+            "fr": "Vente d'œufs",
+            "ca": "Venda d'ous"
           },
           "osmTags": "vending~i~.*eggs.*"
         },
@@ -696,7 +743,8 @@
             "en": "Sale of cheese",
             "nl": "Verkoop van kaas",
             "de": "Verkauf von Käse",
-            "fr": "Vente de fromage"
+            "fr": "Vente de fromage",
+            "ca": "Venda de formatge"
           },
           "osmTags": "vending~i~.*cheese.*"
         },
@@ -705,7 +753,8 @@
             "en": "Sale of honey",
             "nl": "Verkoop van honing",
             "de": "Verkauf von Honig",
-            "fr": "Vente de miel"
+            "fr": "Vente de miel",
+            "ca": "Venda de mel"
           },
           "osmTags": "vending~i~.*honey.*"
         },
@@ -714,7 +763,8 @@
             "en": "Sale of potatoes",
             "nl": "Verkoop van aardappelen",
             "de": "Verkauf von Kartoffeln",
-            "fr": "Vente de pommes de terre"
+            "fr": "Vente de pommes de terre",
+            "ca": "Venda de patates"
           },
           "osmTags": "vending~i~.*potatoes.*"
         },
@@ -723,7 +773,8 @@
             "en": "Sale of flowers",
             "nl": "Verkoop van bloemen",
             "de": "Verkauf von Blumen",
-            "fr": "Vente de fleurs"
+            "fr": "Vente de fleurs",
+            "ca": "Venda de flors"
           },
           "osmTags": "vending~i~.*flowers.*"
         }

assets/layers/veterinary/veterinary.json

@@ -17,7 +17,8 @@
         "de": "ein Tierarzt",
         "es": "un veterinario",
         "nl": "een dierenarts",
-        "fr": "un vétérinaire"
+        "fr": "un vétérinaire",
+        "ca": "un veterinari"
       },
       "tags": [
         "amenity=veterinary",
@@ -29,7 +30,8 @@
         "de": "ein Tierarzt, der Hunde behandelt",
         "es": "un veterinario, que trata a perros",
         "nl": "een dierenarts die honden verzorgt",
-        "fr": "un vétérinaire, qui soigne les chiens"
+        "fr": "un vétérinaire, qui soigne les chiens",
+        "ca": "un veterinari, que tracta gossos"
       }
     }
   ],
@@ -49,7 +51,8 @@
       "de": "Tierarzt",
       "id": "Dokter hewan",
       "es": "Veterinario",
-      "nl": "Dierenarts"
+      "nl": "Dierenarts",
+      "ca": "Veterinari"
     },
     "mappings": [
       {
@@ -101,7 +104,8 @@
         "de": "Wie lautet der Name dieses Tierarztes?",
         "es": "¿Cual es el nombre de este veterinario?",
         "nl": "Wat is de naam van deze dierenartspraktijk?",
-        "fr": "Quel est le nom de ce vétérinaire ?"
+        "fr": "Quel est le nom de ce vétérinaire ?",
+        "ca": "Qui és el nom d'aquest veterinari?"
       },
       "render": {
         "en": "The name of this veterinarian is {name}",
@@ -109,7 +113,8 @@
         "es": "El nombre de este veterinario es {name}",
         "nl": "Deze dierenartspraktijk heet {name}",
         "da": "Navnet på denne dyrlæge er {name}",
-        "fr": "Le nom de ce vétérinaire est {name}"
+        "fr": "Le nom de ce vétérinaire est {name}",
+        "ca": "El nom d'aquest veterinari és {name}"
       },
       "freeform": {
         "key": "name"

assets/layers/viewpoint/viewpoint.json

@@ -18,8 +18,9 @@
     "de": "Ein schöner Aussichtspunkt oder eine schöne Aussicht. Ideal zum Hinzufügen eines Bildes, wenn keine andere Kategorie passt",
     "fr": "Un beau point de vue ou une belle vue. Idéal pour ajouter une image si aucune autre catégorie ne convient",
     "it": "Un punto panoramico che offre una bella vista. L'ideale è aggiungere un'immagine, se nessun'altra categoria è appropriata",
-    "es": "Un buen punto de vista o una buena vista. Ideal para añadir una imagen si no encaja en ninguna otra categoría",
+    "es": "Un buen mirador o una buena vista. Ideal para añadir una imagen si no encaja en ninguna otra categoría",
-    "da": "Et dejligt synspunkt eller flot udsigt. Ideel til at tilføje et billede, hvis ingen anden kategori passer"
+    "da": "Et dejligt synspunkt eller flot udsigt. Ideel til at tilføje et billede, hvis ingen anden kategori passer",
+    "ca": "Un bon mirador o una bonica vista. Ideal per afegir una imatge si no hi caben cap altra categoria"
   },
   "source": {
     "osmTags": "tourism=viewpoint"
@@ -69,7 +70,8 @@
         "it": "Vuoi aggiungere una descrizione?",
         "id": "Apakah Anda ingin menambahkan deskripsi?",
         "es": "¿Quieres añadir una descripción?",
-        "da": "Ønsker du at tilføje en beskrivelse?"
+        "da": "Ønsker du at tilføje en beskrivelse?",
+        "ca": "Vols afegir una descripció?"
       },
       "render": "{description}",
       "freeform": {

assets/layers/visitor_information_centre/visitor_information_centre.json

@@ -6,7 +6,8 @@
     "de": "Besucherinformationszentrum",
     "id": "Pusat Informasi Pengunjung",
     "es": "Centro de Información al Visitante",
-    "da": "Informationscenter for besøgende"
+    "da": "Informationscenter for besøgende",
+    "ca": "Centre d'Informació al Visitant"
   },
   "minzoom": 12,
   "source": {
@@ -70,7 +71,8 @@
     "en": "A visitor center offers information about a specific attraction or place of interest where it is located.",
     "nl": "Een bezoekerscentrum biedt informatie over een specifieke attractie of bezienswaardigheid waar het is gevestigd.",
     "de": "Ein Besucherzentrum bietet Informationen über eine bestimmte Attraktion oder Sehenswürdigkeit, an der es sich befindet.",
-    "es": "Un centro de visitantes ofrece información sobre una atracción específica o lugar de interese donde se sitúa."
+    "es": "Un centro de visitantes ofrece información sobre una atracción específica o lugar de interese donde se sitúa.",
+    "ca": "Un centre de visitants ofereix informació sobre una atracció o lloc d'interès específic on es troba."
   },
   "tagRenderings": [],
   "presets": [],

assets/layers/waste_basket/waste_basket.json

@@ -219,7 +219,8 @@
             "it": "Questo cestino <b>non</b> ha un distributore di sacchetti per escrementi dei cani",
             "id": "Keranjang sampah ini <b> tidak</b> memiliki dispenser untuk kantong kotoran (anjing)",
             "da": "Denne affaldskurv <b>har ikke</b> en dispenser til poser til (hunde)ekskrementer",
-            "fr": "Cette poubelle <b>n'a pas</b> de distributeur de sac pour ramasser les déjections canines"
+            "fr": "Cette poubelle <b>n'a pas</b> de distributeur de sac pour ramasser les déjections canines",
+            "ca": "Aquesta paperera <b>no</b> té un dispensador per a bosses d'excrements (gossos)"
           },
           "hideInAnswer": true
         }

assets/layers/waste_disposal/waste_disposal.json

@@ -16,7 +16,8 @@
     "de": "Entsorgungsbehälter, mittlerer bis großer Behälter zur Entsorgung von (Haushalts-)Abfällen",
     "it": "Cestino per lo smaltimento dei rifiuti, contenitore di dimensioni medio grandi per lo smaltimento dei rifiuti (domestici)",
     "da": "Affaldsspande, mellemstor til stor skraldespand til bortskaffelse af (husholdnings)affald",
-    "fr": "Réceptacle destiné à recevoir des déchets (domestiques) enveloppés dans des sacs en plastique"
+    "fr": "Réceptacle destiné à recevoir des déchets (domestiques) enveloppés dans des sacs en plastique",
+    "ca": "Contenidor de fem, contenidor mitjà o gran per a l'eliminació de residus (domèstics)"
   },
   "source": {
     "osmTags": "amenity=waste_disposal"
@@ -30,7 +31,8 @@
       "de": "Mülltonne",
       "it": "Smaltimento rifiuti",
       "id": "Pembuangan Limbah",
-      "da": "Bortskaffelse af affald"
+      "da": "Bortskaffelse af affald",
+      "ca": "Contenidor de fem"
     }
   },
   "mapRendering": [

assets/layers/windturbine/windturbine.json

@@ -68,7 +68,8 @@
         "hu": "A szélerőmű teljesítménye: {generator:output:electricity}.",
         "de": "Das Windrad erzeugt {generator:output:electricity} Strom.",
         "nl": "Deze windturbine genereert {generator:output:electricity}",
-        "da": "Denne vindmølle har en effekt på {generator:output:electricity}."
+        "da": "Denne vindmølle har en effekt på {generator:output:electricity}.",
+        "ca": "La potència de sortida d'aquest aerogenerador és {generator:output:electricity}."
       },
       "question": {
         "en": "What is the power output of this wind turbine? (e.g. 2.3 MW)",
@@ -79,7 +80,8 @@
         "hu": "Mekkora a teljesítménye ennek a szélturbinának? (pl. 2.3 MW)",
         "de": "Wieviel Strom erzeugt das Windrad? (z.B. 2.3 MW)",
         "nl": "Wat is de output",
-        "da": "Hvad er effekten af denne vindmølle? (f.eks. 2,3 MW)"
+        "da": "Hvad er effekten af denne vindmølle? (f.eks. 2,3 MW)",
+        "ca": "Quina és la potència de sortida d'aquest aerogenerador? (p. ex. 2,3 MW)"
       },
       "freeform": {
         "key": "generator:output:electricity",
@@ -97,7 +99,8 @@
         "hu": "Ennek a szélerőműnek az üzemeltetője: {operator}.",
         "de": "Die Windturbine wird betrieben von {operator}.",
         "da": "Denne vindmølle drives af {operator}.",
-        "nl": "Deze windturbine wordt beheerd door {operator}."
+        "nl": "Deze windturbine wordt beheerd door {operator}.",
+        "ca": "{operator} gestiona aquest aerogenerador."
       },
       "question": {
         "en": "Who operates this wind turbine?",
@@ -108,7 +111,8 @@
         "de": "Wer betreibt das Windrad?",
         "id": "Siapa yang mengoperasikan turbin angin ini?",
         "da": "Hvem driver denne vindmølle?",
-        "nl": "Wie beheert deze windturbine?"
+        "nl": "Wie beheert deze windturbine?",
+        "ca": "Qui opera aquest aerogenerador?"
       },
       "freeform": {
         "key": "operator"
@@ -124,7 +128,8 @@
         "hu": "A szélerőmű teljes (rotor sugarával együtt számított) magassága: {height} méter.",
         "de": "Die Gesamthöhe dieses Windrads beträgt (einschließlich Rotorradius) {height} Meter.",
         "da": "Den samlede højde (inklusive rotorradius) for denne vindmølle er {height} meter.",
-        "nl": "De totale hoogte (inclusief rotor-radius) van deze windturbine is {height} meter"
+        "nl": "De totale hoogte (inclusief rotor-radius) van deze windturbine is {height} meter",
+        "ca": "L'alçada total (inclòs el radi del rotor) d'aquest aerogenerador és de {height} metres."
       },
       "question": {
         "en": "What is the total height of this wind turbine (including rotor radius), in metres?",
@@ -134,7 +139,8 @@
         "hu": "Hány méter a szélerőmű teljes magassága (a rotor sugarával együtt)?",
         "de": "Wie hoch ist das Windrad (inklusive Rotorradius) in Metern?",
         "da": "Hvad er den samlede højde af denne vindmølle (inklusive rotorradius), i meter?",
-        "nl": "Wat is de totale hoogte in meter van deze windturbine (inclusief rotor-radius)?"
+        "nl": "Wat is de totale hoogte in meter van deze windturbine (inclusief rotor-radius)?",
+        "ca": "Quina és l'alçada total d'aquest aerogenerador (inclòs el radi del rotor), en metres?"
       },
       "freeform": {
         "key": "height",
@@ -181,7 +187,8 @@
         "hu": "A szélerőmű üzembe helyezése: {start_date}.",
         "de": "Das Windrad wurde am {start_date} in Betrieb genommen.",
         "nl": "Deze windturbine werd op {start_date} in gebruik genomen",
-        "da": "Denne vindmølle blev sat i drift den/den {start_date}."
+        "da": "Denne vindmølle blev sat i drift den/den {start_date}.",
+        "ca": "Aquest aerogenerador va entrar en funcionament el dia {start_date}."
       },
       "question": {
         "en": "When did this wind turbine go into operation?",
@@ -192,7 +199,8 @@
         "hu": "Mikor helyezték üzembe ezt a szélerőművet?",
         "de": "Wann wurde das Windrad in Betrieb genommen?",
         "nl": "Wanneer werd deze windturbine in gebruik genomen?",
-        "da": "Hvornår blev denne vindmølle taget i brug?"
+        "da": "Hvornår blev denne vindmølle taget i brug?",
+        "ca": "Quan va entrar en funcionament aquest aerogenerador?"
       },
       "freeform": {
         "key": "start_date",
@@ -214,7 +222,8 @@
       "question": {
         "en": "Is there something wrong with how this is mapped, that you weren't able to fix here? (leave a note to OpenStreetMap experts)",
         "nl": "Is er iets mis met de informatie over deze windturbine dat je hier niet opgelost kreeg? (laat hier een berichtje achter voor OpenStreetMap experts)",
-        "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlassen Sie eine Nachricht an OpenStreetMap-Experten)"
+        "de": "Gibt es einen Fehler in der Kartierung, den Sie hier nicht beheben konnten? (hinterlassen Sie eine Nachricht an OpenStreetMap-Experten)",
+        "ca": "Hi ha alguna cosa malament en la manera que està mapejat això que no heu pogut solucionar aquí? (deixeu una nota als experts d'OpenStreetMap)"
       },
       "freeform": {
         "key": "fixme",

assets/themes/mapcomplete-changes/mapcomplete-changes.json

@@ -102,7 +102,7 @@
           },
           "render": {
             "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
-            "ca": "Canvi amb el tema <a href='https://mapcomplete.org/{theme}'>{theme}</a>",
+            "ca": "Canvi amb el tema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
             "de": "Geändert mit Thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
             "fr": "Modifié avec le thème <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
           }
@@ -130,7 +130,7 @@
           "id": "host",
           "render": {
             "en": "Change made with <a href='{host}'>{host}</a>",
-            "ca": "Canviat amb <a href='{host}'>{host}</a>",
+            "ca": "Canviat fet amb <a href='{host}'>{host}</a>",
             "de": "Änderung über <a href='{host}'>{host}</a>",
             "fr": "Modification faite avec <a href='{host}'>{host}</a>",
             "nl": "Wijziging gemaakt met <a href='{host}'>{host}</a>"

langs/layers/ca.json

@@ -35,16 +35,6 @@
             "1": {
                 "title": "un mupi"
             },
-            "10": {
-                "description": "S'utilitza per a cartells publicitaris, rètols de neó, logotips i cartells en entrades institucionals",
-                "title": "un lletrer"
-            },
-            "11": {
-                "title": "una escupltura"
-            },
-            "12": {
-                "title": "una paret pintada"
-            },
             "2": {
                 "title": "un mupi sobre la paret"
             },
@@ -71,6 +61,16 @@
             },
             "9": {
                 "title": "un tòtem"
+            },
+            "10": {
+                "description": "S'utilitza per a cartells publicitaris, rètols de neó, logotips i cartells en entrades institucionals",
+                "title": "un lletrer"
+            },
+            "11": {
+                "title": "una escupltura"
+            },
+            "12": {
+                "title": "una paret pintada"
             }
         },
         "tagRenderings": {
@@ -165,9 +165,6 @@
                     "1": {
                         "then": "Açò és un tauló d'anunis"
                     },
-                    "10": {
-                        "then": "Açò és una paret pintada"
-                    },
                     "2": {
                         "then": "Açò és una columna"
                     },
@@ -191,6 +188,9 @@
                     },
                     "9": {
                         "then": "Açò és un tòtem"
+                    },
+                    "10": {
+                        "then": "Açò és una paret pintada"
                     }
                 },
                 "question": "Quin tipus d'element publicitari és aquest?",
@@ -205,9 +205,6 @@
                 "1": {
                     "then": "Tauló d'anuncis"
                 },
-                "10": {
-                    "then": "Paret Pintada"
-                },
                 "2": {
                     "then": "Mupi"
                 },
@@ -231,6 +228,9 @@
                 },
                 "9": {
                     "then": "Tòtem"
+                },
+                "10": {
+                    "then": "Paret Pintada"
                 }
             }
         }
@@ -312,15 +312,6 @@
                     "1": {
                         "then": "Mural"
                     },
-                    "10": {
-                        "then": "Azulejo (Rajoles decoratives espanyoles i portugueses)"
-                    },
-                    "11": {
-                        "then": "Enrajolat"
-                    },
-                    "12": {
-                        "then": "Tallat a la fusta"
-                    },
                     "2": {
                         "then": "Pintura"
                     },
@@ -344,6 +335,15 @@
                     },
                     "9": {
                         "then": "Relleu"
+                    },
+                    "10": {
+                        "then": "Azulejo (Rajoles decoratives espanyoles i portugueses)"
+                    },
+                    "11": {
+                        "then": "Enrajolat"
+                    },
+                    "12": {
+                        "then": "Tallat a la fusta"
                     }
                 },
                 "question": "Quin tipus d'obra és aquesta peça?",
@@ -1820,27 +1820,6 @@
                     "1": {
                         "question": "Té un connector <div style='display: inline-block'><b><b>Schuko</b> sense pin de terra (CEE7/4 tipus F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div> connector"
                     },
-                    "10": {
-                        "question": "Té un connector <div style='display: inline-block'><b><b>Tipus 2 amb cable</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
-                    },
-                    "11": {
-                        "question": "Té un connector <div style='display: inline-block'><b><b>CCS Tesla Supercharger </b> (un tipus2_css de marca)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div>"
-                    },
-                    "12": {
-                        "question": "Té un connector <div style='display: inline-block'><b><b>Tesla Supercharger (destination)</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div>"
-                    },
-                    "13": {
-                        "question": "Té un connector <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (Tipus 2 amb un cable de marca tesla)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
-                    },
-                    "14": {
-                        "question": "Té un connector <div style='display: inline-block'><b><b>USB</b> per a carregar telèfons i dispositius electrònics petits</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/usb_port.svg'/></div>"
-                    },
-                    "15": {
-                        "question": "Té un connector <div style='display: inline-block'><b><b>Bosch Active Connect amb 3 pins</b> i cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-3pin.svg'/></div>"
-                    },
-                    "16": {
-                        "question": "Té un connector <div style='display: inline-block'><b><b>Bosch Active Connect amb 5 pins</b> i cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>"
-                    },
                     "2": {
                         "question": "Té un connector <div style='display: inline-block'><b><b>endoll de paret Europeu</b> amb un pin de terra (CEE7/4 tipus F)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div>"
                     },
@@ -1864,6 +1843,27 @@
                     },
                     "9": {
                         "question": "Té un connector <div style='display: inline-block'><b><b> CCS Tipus 2</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div>"
+                    },
+                    "10": {
+                        "question": "Té un connector <div style='display: inline-block'><b><b>Tipus 2 amb cable</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
+                    },
+                    "11": {
+                        "question": "Té un connector <div style='display: inline-block'><b><b>CCS Tesla Supercharger </b> (un tipus2_css de marca)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div>"
+                    },
+                    "12": {
+                        "question": "Té un connector <div style='display: inline-block'><b><b>Tesla Supercharger (destination)</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div>"
+                    },
+                    "13": {
+                        "question": "Té un connector <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (Tipus 2 amb un cable de marca tesla)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
+                    },
+                    "14": {
+                        "question": "Té un connector <div style='display: inline-block'><b><b>USB</b> per a carregar telèfons i dispositius electrònics petits</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/usb_port.svg'/></div>"
+                    },
+                    "15": {
+                        "question": "Té un connector <div style='display: inline-block'><b><b>Bosch Active Connect amb 3 pins</b> i cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-3pin.svg'/></div>"
+                    },
+                    "16": {
+                        "question": "Té un connector <div style='display: inline-block'><b><b>Bosch Active Connect amb 5 pins</b> i cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>"
                     }
                 }
             }
@@ -1919,6 +1919,30 @@
                     "1": {
                         "then": "<b>Endoll de paret Schuko</b> sense pin a terra (CEE7/4 tipus F)"
                     },
+                    "2": {
+                        "then": "<b>Endoll de paret Europeu</b> amb pin de terra (CEE7/4 tipus E)"
+                    },
+                    "3": {
+                        "then": "<b>Endoll de paret Europeu</b> amb pin a terra (CEE7/4 tipus E)"
+                    },
+                    "4": {
+                        "then": "<b>Chademo</b>"
+                    },
+                    "5": {
+                        "then": "<b>Chademo</b>"
+                    },
+                    "6": {
+                        "then": "<b>Tipus 1 amb cable</b> (J1772)"
+                    },
+                    "7": {
+                        "then": "<b>Tipus 1 amb cable</b> (J1772)"
+                    },
+                    "8": {
+                        "then": "<b>Tipus 1 <i>sense</i> cable</b> (J1772)"
+                    },
+                    "9": {
+                        "then": "<b>Tipus 1 <i>sense</i> cable</b> (J1772)"
+                    },
                     "10": {
                         "then": "<b>CSS 1Tipus 1</b> (també conegut com Tipus 1 combo)"
                     },
@@ -1949,9 +1973,6 @@
                     "19": {
                         "then": "<b>Tipus 2 amb cable</b> (mennekes)"
                     },
-                    "2": {
-                        "then": "<b>Endoll de paret Europeu</b> amb pin de terra (CEE7/4 tipus E)"
-                    },
                     "20": {
                         "then": "<b>CSS Supercarregador Tesla</b> (un tipus2_css de la marca)"
                     },
@@ -1982,32 +2003,11 @@
                     "29": {
                         "then": "<b>Bosch Active Connect amb 3 pins</b> i cable"
                     },
-                    "3": {
-                        "then": "<b>Endoll de paret Europeu</b> amb pin a terra (CEE7/4 tipus E)"
-                    },
                     "30": {
                         "then": "<b>Bosch Active Connect amb 5 pins</b> i cable"
                     },
                     "31": {
                         "then": "<b>Bosch Active Connect amb 5 pins</b> i cable"
-                    },
-                    "4": {
-                        "then": "<b>Chademo</b>"
-                    },
-                    "5": {
-                        "then": "<b>Chademo</b>"
-                    },
-                    "6": {
-                        "then": "<b>Tipus 1 amb cable</b> (J1772)"
-                    },
-                    "7": {
-                        "then": "<b>Tipus 1 amb cable</b> (J1772)"
-                    },
-                    "8": {
-                        "then": "<b>Tipus 1 <i>sense</i> cable</b> (J1772)"
-                    },
-                    "9": {
-                        "then": "<b>Tipus 1 <i>sense</i> cable</b> (J1772)"
                     }
                 },
                 "question": "Quins tipus de connexions de càrrega estan disponibles aquí?"
@@ -2255,7 +2255,7 @@
                 }
             },
             "questions-technical": {
-                "render": "<h3>Preguntes tècniques</h3>Les preguntes següents són molt tècniques. No dubteu a ignorar-les<br/>{questions(tehcnical)}"
+                "render": "<h3>Preguntes tècniques</h3>Les preguntes següents són molt tècniques. No dubteu a ignorar-les<br/>{questions(technical)}"
             },
             "ref": {
                 "question": "Quin és el número de referència d'aquest punt de càrrega?"
@@ -2865,9 +2865,6 @@
                     "1": {
                         "then": "Aquest carril bici està pavimentat"
                     },
-                    "10": {
-                        "then": "Aquesta via ciclista està feta de gravilla"
-                    },
                     "2": {
                         "then": "Aquest carril bici està fet d'asfalt"
                     },
@@ -2879,6 +2876,9 @@
                     },
                     "9": {
                         "then": "Aquesta via ciclista està feta de grava"
+                    },
+                    "10": {
+                        "then": "Aquesta via ciclista està feta de gravilla"
                     }
                 },
                 "question": "De què està feta la superfície d'aquest carrer?",
@@ -3997,21 +3997,6 @@
                     "1": {
                         "then": "Això és una fregiduria"
                     },
-                    "10": {
-                        "then": "Aquí es serveixen plats xinesos"
-                    },
-                    "11": {
-                        "then": "Aquí es serveixen plats grecs"
-                    },
-                    "12": {
-                        "then": "Aquí es serveixen plats indis"
-                    },
-                    "13": {
-                        "then": "Aquí es serveixen plats turcs"
-                    },
-                    "14": {
-                        "then": "Aquí es serveixen plats tailandesos"
-                    },
                     "2": {
                         "then": "Principalment serveix pasta"
                     },
@@ -4035,6 +4020,21 @@
                     },
                     "9": {
                         "then": "Aquí es serveixen plats francesos"
+                    },
+                    "10": {
+                        "then": "Aquí es serveixen plats xinesos"
+                    },
+                    "11": {
+                        "then": "Aquí es serveixen plats grecs"
+                    },
+                    "12": {
+                        "then": "Aquí es serveixen plats indis"
+                    },
+                    "13": {
+                        "then": "Aquí es serveixen plats turcs"
+                    },
+                    "14": {
+                        "then": "Aquí es serveixen plats tailandesos"
                     }
                 },
                 "question": "Quin menjar es serveix aquí?",
@@ -5760,9 +5760,6 @@
                     "1": {
                         "then": "S'accepten monedes de 2 cèntims"
                     },
-                    "10": {
-                        "then": "S'accepten monedes de 20 cèntims"
-                    },
                     "2": {
                         "then": "S'accepten monedes de 5 cèntims"
                     },
@@ -5786,6 +5783,9 @@
                     },
                     "9": {
                         "then": "S'accepten monedes de 10 cèntims"
+                    },
+                    "10": {
+                        "then": "S'accepten monedes de 20 cèntims"
                     }
                 },
                 "question": "Quines monedes es poden utilitzar per a pagar aquí?"
@@ -6171,6 +6171,30 @@
                     "1": {
                         "question": "Reciclatge de piles"
                     },
+                    "2": {
+                        "question": "Reciclatge de cartrons de begudes"
+                    },
+                    "3": {
+                        "question": "Reciclatge de llaunes"
+                    },
+                    "4": {
+                        "question": "Reciclatge de roba"
+                    },
+                    "5": {
+                        "question": "Reciclatge d'oli de cuina"
+                    },
+                    "6": {
+                        "question": "Reciclatge d'oli de motor"
+                    },
+                    "7": {
+                        "question": "Reciclatge de tubs fluorescents"
+                    },
+                    "8": {
+                        "question": "Reciclatge de residus verds"
+                    },
+                    "9": {
+                        "question": "Reciclatge d'ampolles de vidre"
+                    },
                     "10": {
                         "question": "Reciclatge de vidre"
                     },
@@ -6201,35 +6225,11 @@
                     "19": {
                         "question": "Reciclatge del rebuig"
                     },
-                    "2": {
-                        "question": "Reciclatge de cartrons de begudes"
-                    },
                     "20": {
                         "question": "Reciclatge de cartutxos d'impressora"
                     },
                     "21": {
                         "question": "Reciclatge de bicicletes"
-                    },
-                    "3": {
-                        "question": "Reciclatge de llaunes"
-                    },
-                    "4": {
-                        "question": "Reciclatge de roba"
-                    },
-                    "5": {
-                        "question": "Reciclatge d'oli de cuina"
-                    },
-                    "6": {
-                        "question": "Reciclatge d'oli de motor"
-                    },
-                    "7": {
-                        "question": "Reciclatge de tubs fluorescents"
-                    },
-                    "8": {
-                        "question": "Reciclatge de residus verds"
-                    },
-                    "9": {
-                        "question": "Reciclatge d'ampolles de vidre"
                     }
                 }
             },
@@ -6297,6 +6297,30 @@
                     "1": {
                         "then": "Aquí es poden reciclar els cartons de begudes"
                     },
+                    "2": {
+                        "then": "Aquí es poden reciclar llaunes"
+                    },
+                    "3": {
+                        "then": "Aquí es pot reciclar roba"
+                    },
+                    "4": {
+                        "then": "Aquí es pot reciclar oli de cuina"
+                    },
+                    "5": {
+                        "then": "Aquí es pot reciclar oli de motor"
+                    },
+                    "6": {
+                        "then": "Aquí es poden reciclar tub fluroescents"
+                    },
+                    "7": {
+                        "then": "Aquí es poden reciclar residus verds"
+                    },
+                    "8": {
+                        "then": "Ací es poden reciclar residus orgànics"
+                    },
+                    "9": {
+                        "then": "Aquí es poden reciclar ampolles de vidre"
+                    },
                     "10": {
                         "then": "Aquí es pot reciclar vidre"
                     },
@@ -6327,9 +6351,6 @@
                     "19": {
                         "then": "Aquí es poden reciclar sabates"
                     },
-                    "2": {
-                        "then": "Aquí es poden reciclar llaunes"
-                    },
                     "20": {
                         "then": "Aquí es poden reciclar petits electrodomèstics"
                     },
@@ -6344,27 +6365,6 @@
                     },
                     "24": {
                         "then": "Aquí es poden reciclar bicicletes"
-                    },
-                    "3": {
-                        "then": "Aquí es pot reciclar roba"
-                    },
-                    "4": {
-                        "then": "Aquí es pot reciclar oli de cuina"
-                    },
-                    "5": {
-                        "then": "Aquí es pot reciclar oli de motor"
-                    },
-                    "6": {
-                        "then": "Aquí es poden reciclar tub fluroescents"
-                    },
-                    "7": {
-                        "then": "Aquí es poden reciclar residus verds"
-                    },
-                    "8": {
-                        "then": "Ací es poden reciclar residus orgànics"
-                    },
-                    "9": {
-                        "then": "Aquí es poden reciclar ampolles de vidre"
                     }
                 },
                 "question": "Què es pot reciclar aquí?"
@@ -7023,12 +7023,6 @@
                     "1": {
                         "then": "Aquest fanal utilitza LED"
                     },
-                    "10": {
-                        "then": "Aquest fanal utilitza làmpades de sodi d'alta pressió (taronja amb blanc)"
-                    },
-                    "11": {
-                        "then": "Aquest fanal s'il·lumina amb gas"
-                    },
                     "2": {
                         "then": "Aquest fanal utilitza il·luminació incandescent"
                     },
@@ -7052,6 +7046,12 @@
                     },
                     "9": {
                         "then": "Aquest fanal utilitza làmpades de sodi de baixa pressió (taronja monocroma)"
+                    },
+                    "10": {
+                        "then": "Aquest fanal utilitza làmpades de sodi d'alta pressió (taronja amb blanc)"
+                    },
+                    "11": {
+                        "then": "Aquest fanal s'il·lumina amb gas"
                     }
                 },
                 "question": "Quin tipus d'il·luminació utilitza aquest fanal?"
@@ -7896,27 +7896,6 @@
                     "1": {
                         "question": "Venda de begudes"
                     },
-                    "10": {
-                        "question": "Venda de llet"
-                    },
-                    "11": {
-                        "question": "Venda de pa"
-                    },
-                    "12": {
-                        "question": "Venda d'ous"
-                    },
-                    "13": {
-                        "question": "Venda de formatge"
-                    },
-                    "14": {
-                        "question": "Venda de mel"
-                    },
-                    "15": {
-                        "question": "Venda de patates"
-                    },
-                    "16": {
-                        "question": "Venda de flors"
-                    },
                     "2": {
                         "question": "Venda de llaminadures"
                     },
@@ -7940,6 +7919,27 @@
                     },
                     "9": {
                         "question": "Venda de càmeres interiors de bicicletes"
+                    },
+                    "10": {
+                        "question": "Venda de llet"
+                    },
+                    "11": {
+                        "question": "Venda de pa"
+                    },
+                    "12": {
+                        "question": "Venda d'ous"
+                    },
+                    "13": {
+                        "question": "Venda de formatge"
+                    },
+                    "14": {
+                        "question": "Venda de mel"
+                    },
+                    "15": {
+                        "question": "Venda de patates"
+                    },
+                    "16": {
+                        "question": "Venda de flors"
                     }
                 }
             }
@@ -7980,6 +7980,30 @@
                     "1": {
                         "then": "Es venen llaminadures"
                     },
+                    "2": {
+                        "then": "Es ven menjar"
+                    },
+                    "3": {
+                        "then": "Es ven tabaco"
+                    },
+                    "4": {
+                        "then": "Es venen preservatius"
+                    },
+                    "5": {
+                        "then": "Es ven cafè"
+                    },
+                    "6": {
+                        "then": "Es ven aigua"
+                    },
+                    "7": {
+                        "then": "Es venen diaris"
+                    },
+                    "8": {
+                        "then": "Es venen càmeres interiors de bicicletes"
+                    },
+                    "9": {
+                        "then": "Es ven llet"
+                    },
                     "10": {
                         "then": "Es ven pa"
                     },
@@ -8006,30 +8030,6 @@
                     },
                     "18": {
                         "then": "Es venen bitllets de transport públic"
-                    },
-                    "2": {
-                        "then": "Es ven menjar"
-                    },
-                    "3": {
-                        "then": "Es ven tabaco"
-                    },
-                    "4": {
-                        "then": "Es venen preservatius"
-                    },
-                    "5": {
-                        "then": "Es ven cafè"
-                    },
-                    "6": {
-                        "then": "Es ven aigua"
-                    },
-                    "7": {
-                        "then": "Es venen diaris"
-                    },
-                    "8": {
-                        "then": "Es venen càmeres interiors de bicicletes"
-                    },
-                    "9": {
-                        "then": "Es ven llet"
                     }
                 },
                 "question": "Que ven aquesta màquina expenedora?",

langs/layers/es.json

@@ -35,16 +35,6 @@
             "1": {
                 "title": "un mupi"
             },
-            "10": {
-                "description": "Se utiliza para carteles publicitarios, letreros de neón, logotipos y carteles en entradas institucionales",
-                "title": "un lletrer"
-            },
-            "11": {
-                "title": "una escultura"
-            },
-            "12": {
-                "title": "una pared pintada"
-            },
             "2": {
                 "title": "un mupi sobre la pared"
             },
@@ -71,6 +61,16 @@
             },
             "9": {
                 "title": "un tótem"
+            },
+            "10": {
+                "description": "Se utiliza para carteles publicitarios, letreros de neón, logotipos y carteles en entradas institucionales",
+                "title": "un lletrer"
+            },
+            "11": {
+                "title": "una escultura"
+            },
+            "12": {
+                "title": "una pared pintada"
             }
         },
         "tagRenderings": {
@@ -165,9 +165,6 @@
                     "1": {
                         "then": "Esto es un tablón de anuncios"
                     },
-                    "10": {
-                        "then": "Esto es una pared pintada"
-                    },
                     "2": {
                         "then": "Esto es una columna"
                     },
@@ -191,6 +188,9 @@
                     },
                     "9": {
                         "then": "Esto es un tótem"
+                    },
+                    "10": {
+                        "then": "Esto es una pared pintada"
                     }
                 },
                 "question": "¿Qué tipo de elemento publicitario es?",
@@ -205,9 +205,6 @@
                 "1": {
                     "then": "Tablon de anuncios"
                 },
-                "10": {
-                    "then": "Pared Pintada"
-                },
                 "2": {
                     "then": "Mupi"
                 },
@@ -231,6 +228,9 @@
                 },
                 "9": {
                     "then": "Tótem"
+                },
+                "10": {
+                    "then": "Pared Pintada"
                 }
             }
         }
@@ -312,15 +312,6 @@
                     "1": {
                         "then": "Mural"
                     },
-                    "10": {
-                        "then": "Azulejo (Baldosas decorativas Españolas y Portuguesas)"
-                    },
-                    "11": {
-                        "then": "Cerámica"
-                    },
-                    "12": {
-                        "then": "Tallado en madera"
-                    },
                     "2": {
                         "then": "Pintura"
                     },
@@ -344,6 +335,15 @@
                     },
                     "9": {
                         "then": "Relieve"
+                    },
+                    "10": {
+                        "then": "Azulejo (Baldosas decorativas Españolas y Portuguesas)"
+                    },
+                    "11": {
+                        "then": "Cerámica"
+                    },
+                    "12": {
+                        "then": "Tallado en madera"
                     }
                 },
                 "question": "¿Qué tipo de obra es esta pieza?",
@@ -1440,27 +1440,6 @@
                     "0": {
                         "question": "Todos los conectores"
                     },
-                    "10": {
-                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tipo 2 con cable</b> (mennekes)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
-                    },
-                    "11": {
-                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (un tipo2_css de marca)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div>"
-                    },
-                    "12": {
-                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tesla Supercharger (destination)</b></b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div>"
-                    },
-                    "13": {
-                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (Tipo2 A con un cable de marca tesla)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
-                    },
-                    "14": {
-                        "question": "Tiene un conector <div style='display: inline-block'><b><b>USB</b> para cargar teléfonos y dispositivos electrónicos pequeños</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/usb_port.svg'/></div>"
-                    },
-                    "15": {
-                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Bosch Active Connect con 3 pines</b> y cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-3pin.svg'/></div>"
-                    },
-                    "16": {
-                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Bosch Active Connect con 5 pines</b> y cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>"
-                    },
                     "2": {
                         "question": "Tiene un conector <div style='display: inline-block'><b><b>enchufe de pared Europeo</b> con un pin de tierra (CEE7/4 tipo E)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div>"
                     },
@@ -1484,6 +1463,27 @@
                     },
                     "9": {
                         "question": "Tiene un conector <div style='display: inline-block'><b>Tipo 2 CCS</b> (mennekes)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div>"
+                    },
+                    "10": {
+                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tipo 2 con cable</b> (mennekes)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
+                    },
+                    "11": {
+                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (un tipo2_css de marca)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div>"
+                    },
+                    "12": {
+                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tesla Supercharger (destination)</b></b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div>"
+                    },
+                    "13": {
+                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (Tipo2 A con un cable de marca tesla)</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>"
+                    },
+                    "14": {
+                        "question": "Tiene un conector <div style='display: inline-block'><b><b>USB</b> para cargar teléfonos y dispositivos electrónicos pequeños</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/usb_port.svg'/></div>"
+                    },
+                    "15": {
+                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Bosch Active Connect con 3 pines</b> y cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-3pin.svg'/></div>"
+                    },
+                    "16": {
+                        "question": "Tiene un conector <div style='display: inline-block'><b><b>Bosch Active Connect con 5 pines</b> y cable</b><img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div>"
                     }
                 }
             }
@@ -1538,6 +1538,30 @@
                     "1": {
                         "then": "<b>Enchufe de pared Schuko</b> sin pin de tierra (CEE7/4 tipo F)"
                     },
+                    "2": {
+                        "then": "<b>Enchufe de pared Europeo</b> con pin de tierra (CEE7/4 tipo E)"
+                    },
+                    "3": {
+                        "then": "<b>Enchufe de pared Europeo</b> con pin de tierra (CEE7/4 tipo E)"
+                    },
+                    "4": {
+                        "then": "<b>Chademo</b>"
+                    },
+                    "5": {
+                        "then": "<b>Chademo</b>"
+                    },
+                    "6": {
+                        "then": "<b>Tipo 1 con cable</b> (J1772)"
+                    },
+                    "7": {
+                        "then": "<b>Tipo 1 con cable</b> (J1772)"
+                    },
+                    "8": {
+                        "then": "<b>Tipo 1 <i>sin</i> cable</b> (J1772)"
+                    },
+                    "9": {
+                        "then": "<b>Tipo 1 <i>sin</i> cable</b> (J1772)"
+                    },
                     "10": {
                         "then": "<b>CSS Tipo 1</b> (también conocido como Tipo 1 Combo)"
                     },
@@ -1568,9 +1592,6 @@
                     "19": {
                         "then": "<b>Tipo 2 con cable</b> (mennekes)"
                     },
-                    "2": {
-                        "then": "<b>Enchufe de pared Europeo</b> con pin de tierra (CEE7/4 tipo E)"
-                    },
                     "20": {
                         "then": "<b>CCS Supercargador Tesla</b> (un tipo2_css con marca)"
                     },
@@ -1601,32 +1622,11 @@
                     "29": {
                         "then": "<b>Bosch Active Connect con 3 pines</b> y cable"
                     },
-                    "3": {
-                        "then": "<b>Enchufe de pared Europeo</b> con pin de tierra (CEE7/4 tipo E)"
-                    },
                     "30": {
                         "then": "<b>Bosch Active Connect con 5 pines</b> y cable"
                     },
                     "31": {
                         "then": "<b>Bosch Active Connect con 5 pines</b> y cable"
-                    },
-                    "4": {
-                        "then": "<b>Chademo</b>"
-                    },
-                    "5": {
-                        "then": "<b>Chademo</b>"
-                    },
-                    "6": {
-                        "then": "<b>Tipo 1 con cable</b> (J1772)"
-                    },
-                    "7": {
-                        "then": "<b>Tipo 1 con cable</b> (J1772)"
-                    },
-                    "8": {
-                        "then": "<b>Tipo 1 <i>sin</i> cable</b> (J1772)"
-                    },
-                    "9": {
-                        "then": "<b>Tipo 1 <i>sin</i> cable</b> (J1772)"
                     }
                 },
                 "question": "¿Qué tipo de conexiones de carga están disponibles aquí?"
@@ -2021,12 +2021,6 @@
                     "1": {
                         "then": "Este carril bici está pavimentado"
                     },
-                    "10": {
-                        "then": "Este carril bici está hecho de gravilla"
-                    },
-                    "12": {
-                        "then": "Este carril bici está hecho de tierra natural"
-                    },
                     "2": {
                         "then": "Este carril bici está hecho de asfalto"
                     },
@@ -2041,6 +2035,12 @@
                     },
                     "9": {
                         "then": "Este carril bici está hecho de grava"
+                    },
+                    "10": {
+                        "then": "Este carril bici está hecho de gravilla"
+                    },
+                    "12": {
+                        "then": "Este carril bici está hecho de tierra natural"
                     }
                 },
                 "question": "¿De qué superficie está hecho este carril bici?",
@@ -2086,9 +2086,6 @@
                     "1": {
                         "then": "Este carril bici está pavimentado"
                     },
-                    "10": {
-                        "then": "Este carril bici está hecho de gravilla"
-                    },
                     "2": {
                         "then": "Este carril bici está hecho de asfalto"
                     },
@@ -2100,6 +2097,9 @@
                     },
                     "9": {
                         "then": "Este carril bici está hecho de grava"
+                    },
+                    "10": {
+                        "then": "Este carril bici está hecho de gravilla"
                     }
                 },
                 "question": "¿De qué esta hecha la superficie de esta calle?",
@@ -2724,18 +2724,6 @@
                     "0": {
                         "then": "Esto es una pizzería"
                     },
-                    "10": {
-                        "then": "Aquí se sirven platos Chinos"
-                    },
-                    "11": {
-                        "then": "Aquí se sirven platos Griegos"
-                    },
-                    "12": {
-                        "then": "Aquí se sirven platos Indios"
-                    },
-                    "13": {
-                        "then": "Aquí se sirven platos Turcos"
-                    },
                     "2": {
                         "then": "Principalmente sirve pasta"
                     },
@@ -2756,6 +2744,18 @@
                     },
                     "9": {
                         "then": "Aquí se sirven platos Franceses"
+                    },
+                    "10": {
+                        "then": "Aquí se sirven platos Chinos"
+                    },
+                    "11": {
+                        "then": "Aquí se sirven platos Griegos"
+                    },
+                    "12": {
+                        "then": "Aquí se sirven platos Indios"
+                    },
+                    "13": {
+                        "then": "Aquí se sirven platos Turcos"
                     }
                 },
                 "question": "¿Qué comida se sirve aquí?",
@@ -3153,19 +3153,6 @@
                     }
                 }
             },
-            "10": {
-                "options": {
-                    "0": {
-                        "question": "Todas las notas"
-                    },
-                    "1": {
-                        "question": "Ocultar las nostras de importación"
-                    },
-                    "2": {
-                        "question": "Solo mostrar las notas de importación"
-                    }
-                }
-            },
             "2": {
                 "options": {
                     "0": {
@@ -3221,6 +3208,19 @@
                         "question": "Solo mostrar las notas abiertas"
                     }
                 }
+            },
+            "10": {
+                "options": {
+                    "0": {
+                        "question": "Todas las notas"
+                    },
+                    "1": {
+                        "question": "Ocultar las nostras de importación"
+                    },
+                    "2": {
+                        "question": "Solo mostrar las notas de importación"
+                    }
+                }
             }
         },
         "name": "Notas de OpenStreetMap",
@@ -3836,6 +3836,21 @@
                     "1": {
                         "question": "Reciclaje de baterías"
                     },
+                    "3": {
+                        "question": "Reciclaje de latas"
+                    },
+                    "4": {
+                        "question": "Reciclaje de ropa"
+                    },
+                    "5": {
+                        "question": "Reciclaje de aceite de cocina"
+                    },
+                    "6": {
+                        "question": "Reciclaje de aceite de motor"
+                    },
+                    "9": {
+                        "question": "Reciclaje de botellas de cristal"
+                    },
                     "10": {
                         "question": "Reciclaje de cristal"
                     },
@@ -3859,21 +3874,6 @@
                     },
                     "18": {
                         "question": "Reciclaje de pequeños electrodomésticos"
-                    },
-                    "3": {
-                        "question": "Reciclaje de latas"
-                    },
-                    "4": {
-                        "question": "Reciclaje de ropa"
-                    },
-                    "5": {
-                        "question": "Reciclaje de aceite de cocina"
-                    },
-                    "6": {
-                        "question": "Reciclaje de aceite de motor"
-                    },
-                    "9": {
-                        "question": "Reciclaje de botellas de cristal"
                     }
                 }
             }
@@ -3916,6 +3916,24 @@
                     "0": {
                         "then": "Aquí se pueden reciclar baterías"
                     },
+                    "2": {
+                        "then": "Aquí se pueden reciclar latas"
+                    },
+                    "3": {
+                        "then": "Aquí se puede reciclar ropa"
+                    },
+                    "4": {
+                        "then": "Aquí se puede reciclar aceite de cocina"
+                    },
+                    "5": {
+                        "then": "Aquí se puede reciclar aceite de motor"
+                    },
+                    "8": {
+                        "then": "Aquí se pueden reciclar residuos orgánicos"
+                    },
+                    "9": {
+                        "then": "Aquí se pueden reciclar botellas de cristal"
+                    },
                     "10": {
                         "then": "Aquí se puede reciclar cristal"
                     },
@@ -3939,24 +3957,6 @@
                     },
                     "19": {
                         "then": "Aquí se pueden reciclar zapatos"
-                    },
-                    "2": {
-                        "then": "Aquí se pueden reciclar latas"
-                    },
-                    "3": {
-                        "then": "Aquí se puede reciclar ropa"
-                    },
-                    "4": {
-                        "then": "Aquí se puede reciclar aceite de cocina"
-                    },
-                    "5": {
-                        "then": "Aquí se puede reciclar aceite de motor"
-                    },
-                    "8": {
-                        "then": "Aquí se pueden reciclar residuos orgánicos"
-                    },
-                    "9": {
-                        "then": "Aquí se pueden reciclar botellas de cristal"
                     }
                 },
                 "question": "¿Qué se puede reciclar aquí?"
@@ -4260,6 +4260,11 @@
                 "question": "¿De qué color es la luz que emite esta lámpara?",
                 "render": "Esta lámpara emite luz {light:colour}"
             },
+            "count": {
+                "mappings": {
+                    "0": {}
+                }
+            },
             "direction": {
                 "question": "¿Hacia donde apunta esta lámpara?",
                 "render": "Esta lámpara apunta hacia {light:direction}"
@@ -4300,12 +4305,6 @@
                     "1": {
                         "then": "Esta lámpara utiliza LEDs"
                     },
-                    "10": {
-                        "then": "Esta lámpara utiliza lámparas de sodio de alta presión (naranja con blanco)"
-                    },
-                    "11": {
-                        "then": "Esta lampara se ilumina con gas"
-                    },
                     "2": {
                         "then": "Esta lámpara utiliza iluminación incandescente"
                     },
@@ -4326,6 +4325,12 @@
                     },
                     "9": {
                         "then": "Esta lámpara utiliza lámparas de sodio de baja presión (naranja monocromo)"
+                    },
+                    "10": {
+                        "then": "Esta lámpara utiliza lámparas de sodio de alta presión (naranja con blanco)"
+                    },
+                    "11": {
+                        "then": "Esta lampara se ilumina con gas"
                     }
                 },
                 "question": "¿Qué tipo de iluminación utiliza esta lámpara?"