diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md
index e0609a365..dd6359a8e 100644
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@@ -10,6 +10,7 @@
 1. [Index of builtin TagRendering](#index-of-builtin-tagrendering)
   - [Existing builtin tagrenderings](#existing-builtin-tagrenderings)
     + [images](#images)
+    + [wikipedia](#wikipedia)
     + [website](#website)
     + [phone](#phone)
     + [email](#email)
@@ -43,7 +44,6 @@
     + [export_as_gpx](#export_as_gpx)
     + [export_as_geojson](#export_as_geojson)
     + [minimap](#minimap)
-    + [wikipedia](#wikipedia)
     + [wikidata.school-language](#wikidataschool-language)
     + [id_presets.shop_types](#id_presetsshop_types)
     + [school.capacity](#schoolcapacity)
@@ -105,6 +105,7 @@
   - hydrant
   - indoors
   - information_board
+  - kerbs
   - map
   - nature_reserve
   - observation_tower
@@ -138,6 +139,19 @@
 
 
 
+### wikipedia 
+
+
+
+
+
+  - artwork
+  - nature_reserve
+  - observation_tower
+
+
+
+
 ### website 
 
 
@@ -622,18 +636,6 @@
 
 
 
-### wikipedia 
-
-
-
-
-
-  - nature_reserve
-  - observation_tower
-
-
-
-
 ### wikidata.school-language 
 
 
diff --git a/Docs/BuiltinLayers.md b/Docs/BuiltinLayers.md
index 61010270e..3bb328e7c 100644
--- a/Docs/BuiltinLayers.md
+++ b/Docs/BuiltinLayers.md
@@ -350,7 +350,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - id~^node\/.*$
+  - id~^(node\/.*)$
 
 
 
@@ -391,7 +391,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - id~^..*$
+  - id~.+
 
 
 
@@ -545,7 +545,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - camera:direction~^..*$|direction~^..*$
+  - camera:direction~.+|direction~.+
 
 
 
@@ -813,6 +813,7 @@ The following layers are included in MapComplete:
   - [entrance](./Layers/entrance.md)
   - [etymology](./Layers/etymology.md)
   - [extinguisher](./Layers/extinguisher.md)
+  - [filters](./Layers/filters.md)
   - [fire_station](./Layers/fire_station.md)
   - [food](./Layers/food.md)
   - [ghost_bike](./Layers/ghost_bike.md)
@@ -842,6 +843,7 @@ The following layers are included in MapComplete:
   - [nature_reserve](./Layers/nature_reserve.md)
   - [note](./Layers/note.md)
   - [observation_tower](./Layers/observation_tower.md)
+  - [osm_community_index](./Layers/osm_community_index.md)
   - [parcel_lockers](./Layers/parcel_lockers.md)
   - [parking](./Layers/parking.md)
   - [parking_spaces](./Layers/parking_spaces.md)
diff --git a/Docs/CalculatedTags.md b/Docs/CalculatedTags.md
index ca7f73a14..3796df872 100644
--- a/Docs/CalculatedTags.md
+++ b/Docs/CalculatedTags.md
@@ -17,6 +17,7 @@
     + [_country](#_country)
     + [_isOpen](#_isopen)
     + [_direction:numerical, _direction:leftright](#_directionnumerical,-_direction:leftright)
+    + [_direction:centerpoint](#_directioncenterpoint)
     + [_now:date, _now:datetime, _loaded:date, _loaded:_datetime](#_nowdate,-_now:datetime,-_loaded:date,-_loaded:_datetime)
     + [_last_edit:contributor, _last_edit:contributor:uid, _last_edit:changeset, _last_edit:timestamp, _version_number, _backend](#_last_editcontributor,-_last_edit:contributor:uid,-_last_edit:changeset,-_last_edit:timestamp,-_version_number,-_backend)
     + [sidewalk:left, sidewalk:right, generic_key:left:property, generic_key:right:property](#sidewalkleft,-sidewalk:right,-generic_key:left:property,-generic_key:right:property)
@@ -130,6 +131,16 @@ _direction:numerical is a normalized, numerical direction based on 'camera:direc
 
 
 
+### _direction:centerpoint 
+
+
+
+_direction:centerpoint is the direction of the linestring (in degrees) if one were standing at the projected centerpoint.
+
+This is a lazy metatag and is only calculated when needed
+
+
+
 ### _now:date, _now:datetime, _loaded:date, _loaded:_datetime 
 
 
diff --git a/Docs/Layers/address.md b/Docs/Layers/address.md
index 20f6a72d0..fb9a82dcc 100644
--- a/Docs/Layers/address.md
+++ b/Docs/Layers/address.md
@@ -29,7 +29,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - addr:housenumber~^..*$|addr:street~^..*$
+  - addr:housenumber~.+|addr:street~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22addr%3Ahousenumber%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22addr%3Astreet%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
diff --git a/Docs/Layers/artwork.md b/Docs/Layers/artwork.md
index 7e2bc046b..4d7e679e3 100644
--- a/Docs/Layers/artwork.md
+++ b/Docs/Layers/artwork.md
@@ -60,10 +60,12 @@ this quick overview is incomplete
 
 attribute | type | values which are supported by this layer
 ----------- | ------ | ------------------------------------------
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artwork_type#values) [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type) | [string](../SpecialInputElements.md#string) | [architecture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Darchitecture) [mural](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dmural) [painting](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dpainting) [sculpture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dsculpture) [statue](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstatue) [bust](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dbust) [stone](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstone) [installation](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dinstallation) [graffiti](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dgraffiti) [relief](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Drelief) [azulejo](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dazulejo) [tilework](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dtilework)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artwork_type#values) [artwork_type](https://wiki.openstreetmap.org/wiki/Key:artwork_type) | [string](../SpecialInputElements.md#string) | [architecture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Darchitecture) [mural](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dmural) [painting](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dpainting) [sculpture](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dsculpture) [statue](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstatue) [bust](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dbust) [stone](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dstone) [installation](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dinstallation) [graffiti](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dgraffiti) [relief](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Drelief) [azulejo](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dazulejo) [tilework](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dtilework) [woodcarving](https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dwoodcarving)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artist:wikidata#values) [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/artist_name#values) [artist_name](https://wiki.openstreetmap.org/wiki/Key:artist_name) | [string](../SpecialInputElements.md#string) | 
 [<img src='https://mapcomplete.osm.be/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.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/wikidata#values) [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/subject:wikidata#values) [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
 
 
 
@@ -106,6 +108,21 @@ This is rendered with  This is a {artwork_type}
   - Relief  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:artwork_type' target='_blank'>artwork_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Drelief' target='_blank'>relief</a>`
   - Azulejo (Spanish decorative tilework)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:artwork_type' target='_blank'>artwork_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dazulejo' target='_blank'>azulejo</a>`
   - Tilework  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:artwork_type' target='_blank'>artwork_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dtilework' target='_blank'>tilework</a>`
+  - Woodcarving  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:artwork_type' target='_blank'>artwork_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:artwork_type%3Dwoodcarving' target='_blank'>woodcarving</a>`
+
+
+
+
+### artwork-artist-wikidata 
+
+
+
+The question is  Who made this artwork?
+
+This rendering asks information about the property  [artist:wikidata](https://wiki.openstreetmap.org/wiki/Key:artist:wikidata) 
+
+This is rendered with  This artwork was made by {wikidata_label(artist:wikidata):font-weight:bold}<br/>{wikipedia(artist:wikidata)}
+
 
 
 
@@ -138,16 +155,42 @@ This is rendered with  More information on <a href='{website}' target='_blank'>t
 
 
 
-### artwork-wikidata 
+### wikipedia 
 
 
 
-The question is  Which Wikidata-entry corresponds with <b>this artwork</b>?
+Shows a wikipedia box with the corresponding wikipedia article; the wikidata-item link can be changed by a contributor
+
+The question is  What is the corresponding Wikidata entity?
 
 This rendering asks information about the property  [wikidata](https://wiki.openstreetmap.org/wiki/Key:wikidata) 
 
-This is rendered with  Corresponds with <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>
+This is rendered with  {wikipedia():max-height:25rem}
 
- 
+
+
+
+
+  - {wikipedia():max-height:25rem}  corresponds with  `wikipedia~.+`
+  - This option cannot be chosen as answer
+  - No Wikipedia page has been linked yet  corresponds with  ``
+  - This option cannot be chosen as answer
+
+
+
+
+### artwork_subject 
+
+
+
+The question is  What does this artwork depict?
+
+This rendering asks information about the property  [subject:wikidata](https://wiki.openstreetmap.org/wiki/Key:subject:wikidata) 
+
+This is rendered with  This artwork depicts {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}
+
+
+
+Only visible if  `subject:wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/layers/artwork/artwork.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/artwork/artwork.json)
\ No newline at end of file
diff --git a/Docs/Layers/bicycle_library.md b/Docs/Layers/bicycle_library.md
index 0e010270c..09b27c3f1 100644
--- a/Docs/Layers/bicycle_library.md
+++ b/Docs/Layers/bicycle_library.md
@@ -113,7 +113,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -133,7 +133,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -153,7 +153,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/bicycle_rental.md b/Docs/Layers/bicycle_rental.md
index 3f5588121..5047a8489 100644
--- a/Docs/Layers/bicycle_rental.md
+++ b/Docs/Layers/bicycle_rental.md
@@ -41,10 +41,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_rental' target='_blank'>bicycle_rental</a>|bicycle_rental~^..*$|<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a>|rental~^.*bicycle.*$
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_rental' target='_blank'>bicycle_rental</a>|bicycle_rental~.+|<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a>|rental~^(.*bicycle.*)$
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22bicycle_rental%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22service%3Abicycle%3Arental%22%3D%22yes%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22bicycle_rental%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22rental%22~%22%5E.*bicycle.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22bicycle_rental%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22service%3Abicycle%3Arental%22%3D%22yes%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22bicycle_rental%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22rental%22~%22%5E(.*bicycle.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -125,7 +125,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -145,7 +145,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -165,7 +165,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -183,7 +183,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `shop~^..*$|opening_hours~^..*$`  is shown
+Only visible if  `shop~.+|opening_hours~.+`  is shown
 
 
 
@@ -203,7 +203,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^..*$`  is shown
+Only visible if  `shop~.+`  is shown
 
 
 
@@ -269,7 +269,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^.*city_bike.*$`  is shown
+Only visible if  `rental~^(.*city_bike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -287,7 +287,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^.*ebike.*$`  is shown
+Only visible if  `rental~^(.*ebike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -305,7 +305,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^.*kid_bike.*$`  is shown
+Only visible if  `rental~^(.*kid_bike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -323,7 +323,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^.*bmx.*$`  is shown
+Only visible if  `rental~^(.*bmx.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -341,7 +341,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^.*mtb.*$`  is shown
+Only visible if  `rental~^(.*mtb.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -359,7 +359,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^.*bicycle_pannier.*$`  is shown
+Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -377,7 +377,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^.*tandem_bicycle.*$`  is shown
+Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental` 
 
diff --git a/Docs/Layers/bicycle_rental_non_docking.md b/Docs/Layers/bicycle_rental_non_docking.md
index 0cc8669c9..6fdf9b60a 100644
--- a/Docs/Layers/bicycle_rental_non_docking.md
+++ b/Docs/Layers/bicycle_rental_non_docking.md
@@ -39,11 +39,11 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_rental' target='_blank'>bicycle_rental</a>|bicycle_rental~^..*$|<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a>|rental~^.*bicycle.*$
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbicycle_rental' target='_blank'>bicycle_rental</a>|bicycle_rental~.+|<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:rental' target='_blank'>service:bicycle:rental</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:rental%3Dyes' target='_blank'>yes</a>|rental~^(.*bicycle.*)$
   - bicycle_rental!=docking_station
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22bicycle_rental%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22service%3Abicycle%3Arental%22%3D%22yes%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22bicycle_rental%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22rental%22~%22%5E.*bicycle.*%24%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22bicycle_rental%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22service%3Abicycle%3Arental%22%3D%22yes%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22bicycle_rental%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22rental%22~%22%5E(.*bicycle.*)%24%22%5D%5B%22bicycle_rental%22!%3D%22docking_station%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -124,7 +124,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -144,7 +144,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -164,7 +164,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -182,7 +182,7 @@ This is rendered with  <h3>Opening hours</h3>{opening_hours_table(opening_hours)
 
 
 
-Only visible if  `shop~^..*$|opening_hours~^..*$`  is shown
+Only visible if  `shop~.+|opening_hours~.+`  is shown
 
 
 
@@ -202,7 +202,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^..*$`  is shown
+Only visible if  `shop~.+`  is shown
 
 
 
@@ -268,7 +268,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^.*city_bike.*$`  is shown
+Only visible if  `rental~^(.*city_bike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -286,7 +286,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^.*ebike.*$`  is shown
+Only visible if  `rental~^(.*ebike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -304,7 +304,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^.*kid_bike.*$`  is shown
+Only visible if  `rental~^(.*kid_bike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -322,7 +322,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^.*bmx.*$`  is shown
+Only visible if  `rental~^(.*bmx.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -340,7 +340,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^.*mtb.*$`  is shown
+Only visible if  `rental~^(.*mtb.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -358,7 +358,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^.*bicycle_pannier.*$`  is shown
+Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -376,7 +376,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^.*tandem_bicycle.*$`  is shown
+Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
diff --git a/Docs/Layers/bicycle_tube_vending_machine.md b/Docs/Layers/bicycle_tube_vending_machine.md
index fb4ac524b..93c252bd8 100644
--- a/Docs/Layers/bicycle_tube_vending_machine.md
+++ b/Docs/Layers/bicycle_tube_vending_machine.md
@@ -41,10 +41,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
   - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dvending_machine' target='_blank'>vending_machine</a>
-  - vending~^.*bicycle_tube.*$
+  - vending~^(.*bicycle_tube.*)$
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22vending_machine%22%5D%5B%22vending%22~%22%5E.*bicycle_tube.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22vending_machine%22%5D%5B%22vending%22~%22%5E(.*bicycle_tube.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
diff --git a/Docs/Layers/bike_cafe.md b/Docs/Layers/bike_cafe.md
index 7ffbe8d44..2a4cee15d 100644
--- a/Docs/Layers/bike_cafe.md
+++ b/Docs/Layers/bike_cafe.md
@@ -41,10 +41,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
   - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dpub' target='_blank'>pub</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbar' target='_blank'>bar</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcafe' target='_blank'>cafe</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:pub' target='_blank'>pub</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:pub%3Dcycling' target='_blank'>cycling</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:pub' target='_blank'>pub</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:pub%3Dbicycle' target='_blank'>bicycle</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:theme' target='_blank'>theme</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:theme%3Dcycling' target='_blank'>cycling</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:theme' target='_blank'>theme</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:theme%3Dbicycle' target='_blank'>bicycle</a>|^service:bicycle:.*$~~^..*$
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:pub' target='_blank'>pub</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:pub%3Dcycling' target='_blank'>cycling</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:pub' target='_blank'>pub</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:pub%3Dbicycle' target='_blank'>bicycle</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:theme' target='_blank'>theme</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:theme%3Dcycling' target='_blank'>cycling</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:theme' target='_blank'>theme</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:theme%3Dbicycle' target='_blank'>bicycle</a>|^(service:bicycle:.*)$~~.+
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B~%22%5Eservice%3Abicycle%3A.*%24%22~%22%5E..*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B~%22%5Eservice%3Abicycle%3A.*%24%22~%22%5E..*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B~%22%5Eservice%3Abicycle%3A.*%24%22~%22%5E..*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B~%22%5Eservice%3Abicycle%3A.*%24%22~%22%5E..*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22pub%22%5D%5B~%22%5E(service%3Abicycle%3A.*)%24%22~%22.%2B%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22bar%22%5D%5B~%22%5E(service%3Abicycle%3A.*)%24%22~%22.%2B%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22cafe%22%5D%5B~%22%5E(service%3Abicycle%3A.*)%24%22~%22.%2B%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22pub%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22pub%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22theme%22%3D%22cycling%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22theme%22%3D%22bicycle%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B~%22%5E(service%3Abicycle%3A.*)%24%22~%22.%2B%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
diff --git a/Docs/Layers/bike_parking.md b/Docs/Layers/bike_parking.md
index 2b99d63be..566372593 100644
--- a/Docs/Layers/bike_parking.md
+++ b/Docs/Layers/bike_parking.md
@@ -209,6 +209,6 @@ This is rendered with  This parking fits {capacity:cargo_bike} cargo bikes
 
 
 
-Only visible if  `cargo_bike~^designated|yes$`  is shown 
+Only visible if  `cargo_bike~^(designated|yes)$`  is shown 
 
 This document is autogenerated from [assets/layers/bike_parking/bike_parking.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/bike_parking/bike_parking.json)
\ No newline at end of file
diff --git a/Docs/Layers/bike_repair_station.md b/Docs/Layers/bike_repair_station.md
index 82c1078d6..ad209255f 100644
--- a/Docs/Layers/bike_repair_station.md
+++ b/Docs/Layers/bike_repair_station.md
@@ -256,7 +256,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `email~^..*$&service:bicycle:pump:operational_status=broken`  is shown
+Only visible if  `email~.+&service:bicycle:pump:operational_status=broken`  is shown
 
 
 
diff --git a/Docs/Layers/bike_shop.md b/Docs/Layers/bike_shop.md
index 1a2c3efef..08fb9b9cf 100644
--- a/Docs/Layers/bike_shop.md
+++ b/Docs/Layers/bike_shop.md
@@ -113,7 +113,7 @@ This tagrendering has no question and is thus read-only
   - This business focuses on rental  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Drental' target='_blank'>rental</a>`
 
 
-Only visible if  `shop~^..*$&shop!~^bicycle$&shop!~^sports$`  is shown
+Only visible if  `shop~.+&shop!~^(bicycle)$&shop!~^(sports)$`  is shown
 
 
 
@@ -145,7 +145,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -165,7 +165,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -185,7 +185,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -309,7 +309,7 @@ This is rendered with  {capacity:city_bike} city bikes can be rented here
 
 
 
-Only visible if  `rental~^.*city_bike.*$`  is shown
+Only visible if  `rental~^(.*city_bike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -327,7 +327,7 @@ This is rendered with  {capacity:ebike} electrical bikes can be rented here
 
 
 
-Only visible if  `rental~^.*ebike.*$`  is shown
+Only visible if  `rental~^(.*ebike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -345,7 +345,7 @@ This is rendered with  {capacity:kid_bike} bikes for children can be rented here
 
 
 
-Only visible if  `rental~^.*kid_bike.*$`  is shown
+Only visible if  `rental~^(.*kid_bike.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -363,7 +363,7 @@ This is rendered with  {capacity:bmx} BMX bikes can be rented here
 
 
 
-Only visible if  `rental~^.*bmx.*$`  is shown
+Only visible if  `rental~^(.*bmx.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -381,7 +381,7 @@ This is rendered with  {capacity:mtb} mountainbike can be rented here
 
 
 
-Only visible if  `rental~^.*mtb.*$`  is shown
+Only visible if  `rental~^(.*mtb.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -399,7 +399,7 @@ This is rendered with  {capacity:bicycle_pannier} bicycle panniers can be rented
 
 
 
-Only visible if  `rental~^.*bicycle_pannier.*$`  is shown
+Only visible if  `rental~^(.*bicycle_pannier.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
@@ -417,7 +417,7 @@ This is rendered with  {capacity:tandem_bicycle} tandem can be rented here
 
 
 
-Only visible if  `rental~^.*tandem_bicycle.*$`  is shown
+Only visible if  `rental~^(.*tandem_bicycle.*)$`  is shown
 
 This tagrendering has labels  `bicycle_rental`
 
diff --git a/Docs/Layers/bike_themed_object.md b/Docs/Layers/bike_themed_object.md
index 8abfee10d..31e5e43a4 100644
--- a/Docs/Layers/bike_themed_object.md
+++ b/Docs/Layers/bike_themed_object.md
@@ -109,7 +109,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -129,7 +129,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -149,7 +149,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/cafe_pub.md b/Docs/Layers/cafe_pub.md
index d8d74b29a..961f9affd 100644
--- a/Docs/Layers/cafe_pub.md
+++ b/Docs/Layers/cafe_pub.md
@@ -178,7 +178,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -198,7 +198,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -218,7 +218,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -348,7 +348,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~^..*$`  is shown
+Only visible if  `internet_access!=no&internet_access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/caravansites.md b/Docs/Layers/caravansites.md
index 9e392157a..b7f1e4056 100644
--- a/Docs/Layers/caravansites.md
+++ b/Docs/Layers/caravansites.md
@@ -40,10 +40,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
   - <a href='https://wiki.openstreetmap.org/wiki/Key:tourism' target='_blank'>tourism</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dcaravan_site' target='_blank'>caravan_site</a>
-  - permanent_camping!~^only$
+  - permanent_camping!~^(only)$
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22tourism%22%3D%22caravan_site%22%5D%5B%22permanent_camping%22!~%22%5Eonly%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22tourism%22%3D%22caravan_site%22%5D%5B%22permanent_camping%22!~%22%5E(only)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
diff --git a/Docs/Layers/charging_station.md b/Docs/Layers/charging_station.md
index 153e335c8..0ed7013ce 100644
--- a/Docs/Layers/charging_station.md
+++ b/Docs/Layers/charging_station.md
@@ -231,67 +231,67 @@ The question is  Which charging connections are available here?
 
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko' target='_blank'>socket:schuko</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)  corresponds with  `socket:schuko~^..*$&socket:schuko!=1`
+  - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)  corresponds with  `socket:schuko~.+&socket:schuko!=1`
   - This option cannot be chosen as answer
   - <b>European wall plug</b> with ground pin (CEE7/4 type E)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee' target='_blank'>socket:typee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>European wall plug</b> with ground pin (CEE7/4 type E)  corresponds with  `socket:typee~^..*$&socket:typee!=1`
+  - <b>European wall plug</b> with ground pin (CEE7/4 type E)  corresponds with  `socket:typee~.+&socket:typee!=1`
   - This option cannot be chosen as answer
   - <b>Chademo</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo' target='_blank'>socket:chademo</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Chademo</b>  corresponds with  `socket:chademo~^..*$&socket:chademo!=1`
+  - <b>Chademo</b>  corresponds with  `socket:chademo~.+&socket:chademo!=1`
   - This option cannot be chosen as answer
   - <b>Type 1 with cable</b> (J1772)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable' target='_blank'>socket:type1_cable</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 1 with cable</b> (J1772)  corresponds with  `socket:type1_cable~^..*$&socket:type1_cable!=1`
+  - <b>Type 1 with cable</b> (J1772)  corresponds with  `socket:type1_cable~.+&socket:type1_cable!=1`
   - This option cannot be chosen as answer
   - <b>Type 1 <i>without</i> cable</b> (J1772)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1' target='_blank'>socket:type1</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 1 <i>without</i> cable</b> (J1772)  corresponds with  `socket:type1~^..*$&socket:type1!=1`
+  - <b>Type 1 <i>without</i> cable</b> (J1772)  corresponds with  `socket:type1~.+&socket:type1!=1`
   - This option cannot be chosen as answer
   - <b>Type 1 CCS</b> (aka Type 1 Combo)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo' target='_blank'>socket:type1_combo</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 1 CCS</b> (aka Type 1 Combo)  corresponds with  `socket:type1_combo~^..*$&socket:type1_combo!=1`
+  - <b>Type 1 CCS</b> (aka Type 1 Combo)  corresponds with  `socket:type1_combo~.+&socket:type1_combo!=1`
   - This option cannot be chosen as answer
   - <b>Tesla Supercharger</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger' target='_blank'>socket:tesla_supercharger</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla Supercharger</b>  corresponds with  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=1`
+  - <b>Tesla Supercharger</b>  corresponds with  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=1`
   - This option cannot be chosen as answer
   - <b>Type 2</b> (mennekes)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2' target='_blank'>socket:type2</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 2</b> (mennekes)  corresponds with  `socket:type2~^..*$&socket:type2!=1`
+  - <b>Type 2</b> (mennekes)  corresponds with  `socket:type2~.+&socket:type2!=1`
   - This option cannot be chosen as answer
   - <b>Type 2 CCS</b> (mennekes)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo' target='_blank'>socket:type2_combo</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 2 CCS</b> (mennekes)  corresponds with  `socket:type2_combo~^..*$&socket:type2_combo!=1`
+  - <b>Type 2 CCS</b> (mennekes)  corresponds with  `socket:type2_combo~.+&socket:type2_combo!=1`
   - This option cannot be chosen as answer
   - <b>Type 2 with cable</b> (mennekes)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable' target='_blank'>socket:type2_cable</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 2 with cable</b> (mennekes)  corresponds with  `socket:type2_cable~^..*$&socket:type2_cable!=1`
+  - <b>Type 2 with cable</b> (mennekes)  corresponds with  `socket:type2_cable~.+&socket:type2_cable!=1`
   - This option cannot be chosen as answer
   - <b>Tesla Supercharger CCS</b> (a branded type2_css)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs' target='_blank'>socket:tesla_supercharger_ccs</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla Supercharger CCS</b> (a branded type2_css)  corresponds with  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=1`
+  - <b>Tesla Supercharger CCS</b> (a branded type2_css)  corresponds with  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=1`
   - This option cannot be chosen as answer
   - <b>Tesla Supercharger (destination)</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination' target='_blank'>socket:tesla_destination</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla Supercharger (destination)</b>  corresponds with  `socket:tesla_destination~^..*$&socket:tesla_destination!=1&<a href='https://wiki.openstreetmap.org/wiki/Key:_country' target='_blank'>_country</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:_country%3Dus' target='_blank'>us</a>`
+  - <b>Tesla Supercharger (destination)</b>  corresponds with  `socket:tesla_destination~.+&socket:tesla_destination!=1&<a href='https://wiki.openstreetmap.org/wiki/Key:_country' target='_blank'>_country</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:_country%3Dus' target='_blank'>us</a>`
   - This option cannot be chosen as answer
   - <b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination' target='_blank'>socket:tesla_destination</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)  corresponds with  `socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country!=us`
+  - <b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)  corresponds with  `socket:tesla_destination~.+&socket:tesla_destination!=1&_country!=us`
   - This option cannot be chosen as answer
   - <b>USB</b> to charge phones and small electronics  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A' target='_blank'>socket:USB-A</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>USB</b> to charge phones and small electronics  corresponds with  `socket:USB-A~^..*$&socket:USB-A!=1`
+  - <b>USB</b> to charge phones and small electronics  corresponds with  `socket:USB-A~.+&socket:USB-A!=1`
   - This option cannot be chosen as answer
   - <b>Bosch Active Connect with 3 pins</b> and cable  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:bosch_3pin' target='_blank'>socket:bosch_3pin</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:bosch_3pin%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Bosch Active Connect with 3 pins</b> and cable  corresponds with  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=1`
+  - <b>Bosch Active Connect with 3 pins</b> and cable  corresponds with  `socket:bosch_3pin~.+&socket:bosch_3pin!=1`
   - This option cannot be chosen as answer
   - <b>Bosch Active Connect with 5 pins</b> and cable  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:bosch_5pin' target='_blank'>socket:bosch_5pin</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:bosch_5pin%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Bosch Active Connect with 5 pins</b> and cable  corresponds with  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=1`
+  - <b>Bosch Active Connect with 5 pins</b> and cable  corresponds with  `socket:bosch_5pin~.+&socket:bosch_5pin!=1`
   - This option cannot be chosen as answer
 
 
@@ -309,7 +309,7 @@ This is rendered with  There are <b class='text-xl'>{socket:schuko}</b> plugs of
 
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 
 
@@ -325,7 +325,7 @@ This is rendered with  There are <b class='text-xl'>{socket:typee}</b> plugs of
 
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 
 
@@ -341,7 +341,7 @@ This is rendered with  There are <b class='text-xl'>{socket:chademo}</b> plugs o
 
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 
 
@@ -357,7 +357,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_cable}</b> plu
 
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 
 
@@ -373,7 +373,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1}</b> plugs of
 
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 
 
@@ -389,7 +389,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_combo}</b> plu
 
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 
 
@@ -405,7 +405,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger}<
 
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 
 
@@ -421,7 +421,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2}</b> plugs of
 
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 
 
@@ -437,7 +437,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_combo}</b> plu
 
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 
 
@@ -453,7 +453,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_cable}</b> plu
 
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 
 
@@ -469,7 +469,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger_c
 
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 
 
@@ -485,7 +485,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 
 
@@ -501,7 +501,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 
 
@@ -517,7 +517,7 @@ This is rendered with  There are <b class='text-xl'>{socket:USB-A}</b> plugs of
 
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 
 
@@ -533,7 +533,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_3pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 
 
@@ -549,7 +549,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_5pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 
 
@@ -570,7 +570,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:voltage' target='_blank'>socket:schuko:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -593,7 +593,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:current' target='_blank'>socket:schuko:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -616,7 +616,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 3.6 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:output' target='_blank'>socket:schuko:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:output%3D3.6 kW' target='_blank'>3.6 kW</a>`
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -639,7 +639,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:voltage' target='_blank'>socket:typee:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -662,7 +662,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:current' target='_blank'>socket:typee:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -686,7 +686,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:output' target='_blank'>socket:typee:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -709,7 +709,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs 500 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:voltage' target='_blank'>socket:chademo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:voltage%3D500 V' target='_blank'>500 V</a>`
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -732,7 +732,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 120 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:current' target='_blank'>socket:chademo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:current%3D120 A' target='_blank'>120 A</a>`
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -755,7 +755,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:output' target='_blank'>socket:chademo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -779,7 +779,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:voltage' target='_blank'>socket:type1_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -802,7 +802,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:current' target='_blank'>socket:type1_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -826,7 +826,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 7 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:output' target='_blank'>socket:type1_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:output%3D7 kW' target='_blank'>7 kW</a>`
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -850,7 +850,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:voltage' target='_blank'>socket:type1:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -873,7 +873,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:current' target='_blank'>socket:type1:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -899,7 +899,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7.2 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:output' target='_blank'>socket:type1:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:output%3D7.2 kW' target='_blank'>7.2 kW</a>`
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -923,7 +923,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs 1000 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:voltage' target='_blank'>socket:type1_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:voltage%3D1000 V' target='_blank'>1000 V</a>`
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -947,7 +947,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 125 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:current' target='_blank'>socket:type1_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:current%3D125 A' target='_blank'>125 A</a>`
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -973,7 +973,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 350 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:output' target='_blank'>socket:type1_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:output%3D350 kW' target='_blank'>350 kW</a>`
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -996,7 +996,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:voltage' target='_blank'>socket:tesla_supercharger:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1020,7 +1020,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:current' target='_blank'>socket:tesla_supercharger:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1045,7 +1045,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:output' target='_blank'>socket:tesla_supercharger:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1069,7 +1069,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:voltage' target='_blank'>socket:type2:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1093,7 +1093,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:current' target='_blank'>socket:type2:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1117,7 +1117,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:output' target='_blank'>socket:type2:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1141,7 +1141,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:voltage' target='_blank'>socket:type2_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1165,7 +1165,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:current' target='_blank'>socket:type2_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1188,7 +1188,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:output' target='_blank'>socket:type2_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1212,7 +1212,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:voltage' target='_blank'>socket:type2_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1236,7 +1236,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:current' target='_blank'>socket:type2_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1260,7 +1260,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:output' target='_blank'>socket:type2_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1284,7 +1284,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:voltage' target='_blank'>socket:tesla_supercharger_ccs:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1308,7 +1308,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded type2_css) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:current' target='_blank'>socket:tesla_supercharger_ccs:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1331,7 +1331,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:output' target='_blank'>socket:tesla_supercharger_ccs:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1354,7 +1354,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1378,7 +1378,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1403,7 +1403,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1427,7 +1427,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1451,7 +1451,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1475,7 +1475,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1498,7 +1498,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs 5 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:voltage' target='_blank'>socket:USB-A:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:voltage%3D5 V' target='_blank'>5 V</a>`
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1522,7 +1522,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 2 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:current' target='_blank'>socket:USB-A:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:current%3D2 A' target='_blank'>2 A</a>`
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1546,7 +1546,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 10w A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:output' target='_blank'>socket:USB-A:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:output%3D10W' target='_blank'>10W</a>`
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1569,7 +1569,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1592,7 +1592,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1615,7 +1615,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1638,7 +1638,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1661,7 +1661,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1684,7 +1684,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1765,7 +1765,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:membership_card' target='_blank'>payment:membership_card</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:membership_card%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~^..*$`  is shown
+Only visible if  `fee=yes|charge~.+`  is shown
 
 
 
@@ -1832,7 +1832,7 @@ This is rendered with  One can stay at most <b>{canonical(maxstay)}</b>
   - No timelimit on leaving your vehicle here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>`
 
 
-Only visible if  `maxstay~^..*$|motorcar=yes|hgv=yes|bus=yes`  is shown
+Only visible if  `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`  is shown
 
 
 
@@ -1961,7 +1961,7 @@ This is rendered with  Reference number is <b>{ref}</b>
 
 
 
-Only visible if  `network~^..*$`  is shown
+Only visible if  `network~.+`  is shown
 
 
 
diff --git a/Docs/Layers/charging_station_ebikes.md b/Docs/Layers/charging_station_ebikes.md
index 0791d3124..8f66c8d8c 100644
--- a/Docs/Layers/charging_station_ebikes.md
+++ b/Docs/Layers/charging_station_ebikes.md
@@ -230,67 +230,67 @@ The question is  Which charging connections are available here?
 
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko' target='_blank'>socket:schuko</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)  corresponds with  `socket:schuko~^..*$&socket:schuko!=1`
+  - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)  corresponds with  `socket:schuko~.+&socket:schuko!=1`
   - This option cannot be chosen as answer
   - <b>European wall plug</b> with ground pin (CEE7/4 type E)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee' target='_blank'>socket:typee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>European wall plug</b> with ground pin (CEE7/4 type E)  corresponds with  `socket:typee~^..*$&socket:typee!=1`
+  - <b>European wall plug</b> with ground pin (CEE7/4 type E)  corresponds with  `socket:typee~.+&socket:typee!=1`
   - This option cannot be chosen as answer
   - <b>Chademo</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo' target='_blank'>socket:chademo</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Chademo</b>  corresponds with  `socket:chademo~^..*$&socket:chademo!=1`
+  - <b>Chademo</b>  corresponds with  `socket:chademo~.+&socket:chademo!=1`
   - This option cannot be chosen as answer
   - <b>Type 1 with cable</b> (J1772)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable' target='_blank'>socket:type1_cable</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 1 with cable</b> (J1772)  corresponds with  `socket:type1_cable~^..*$&socket:type1_cable!=1`
+  - <b>Type 1 with cable</b> (J1772)  corresponds with  `socket:type1_cable~.+&socket:type1_cable!=1`
   - This option cannot be chosen as answer
   - <b>Type 1 <i>without</i> cable</b> (J1772)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1' target='_blank'>socket:type1</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 1 <i>without</i> cable</b> (J1772)  corresponds with  `socket:type1~^..*$&socket:type1!=1`
+  - <b>Type 1 <i>without</i> cable</b> (J1772)  corresponds with  `socket:type1~.+&socket:type1!=1`
   - This option cannot be chosen as answer
   - <b>Type 1 CCS</b> (aka Type 1 Combo)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo' target='_blank'>socket:type1_combo</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 1 CCS</b> (aka Type 1 Combo)  corresponds with  `socket:type1_combo~^..*$&socket:type1_combo!=1`
+  - <b>Type 1 CCS</b> (aka Type 1 Combo)  corresponds with  `socket:type1_combo~.+&socket:type1_combo!=1`
   - This option cannot be chosen as answer
   - <b>Tesla Supercharger</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger' target='_blank'>socket:tesla_supercharger</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla Supercharger</b>  corresponds with  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=1`
+  - <b>Tesla Supercharger</b>  corresponds with  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=1`
   - This option cannot be chosen as answer
   - <b>Type 2</b> (mennekes)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2' target='_blank'>socket:type2</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 2</b> (mennekes)  corresponds with  `socket:type2~^..*$&socket:type2!=1`
+  - <b>Type 2</b> (mennekes)  corresponds with  `socket:type2~.+&socket:type2!=1`
   - This option cannot be chosen as answer
   - <b>Type 2 CCS</b> (mennekes)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo' target='_blank'>socket:type2_combo</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 2 CCS</b> (mennekes)  corresponds with  `socket:type2_combo~^..*$&socket:type2_combo!=1`
+  - <b>Type 2 CCS</b> (mennekes)  corresponds with  `socket:type2_combo~.+&socket:type2_combo!=1`
   - This option cannot be chosen as answer
   - <b>Type 2 with cable</b> (mennekes)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable' target='_blank'>socket:type2_cable</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Type 2 with cable</b> (mennekes)  corresponds with  `socket:type2_cable~^..*$&socket:type2_cable!=1`
+  - <b>Type 2 with cable</b> (mennekes)  corresponds with  `socket:type2_cable~.+&socket:type2_cable!=1`
   - This option cannot be chosen as answer
   - <b>Tesla Supercharger CCS</b> (a branded type2_css)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs' target='_blank'>socket:tesla_supercharger_ccs</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla Supercharger CCS</b> (a branded type2_css)  corresponds with  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=1`
+  - <b>Tesla Supercharger CCS</b> (a branded type2_css)  corresponds with  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=1`
   - This option cannot be chosen as answer
   - <b>Tesla Supercharger (destination)</b>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination' target='_blank'>socket:tesla_destination</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla Supercharger (destination)</b>  corresponds with  `socket:tesla_destination~^..*$&socket:tesla_destination!=1&<a href='https://wiki.openstreetmap.org/wiki/Key:_country' target='_blank'>_country</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:_country%3Dus' target='_blank'>us</a>`
+  - <b>Tesla Supercharger (destination)</b>  corresponds with  `socket:tesla_destination~.+&socket:tesla_destination!=1&<a href='https://wiki.openstreetmap.org/wiki/Key:_country' target='_blank'>_country</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:_country%3Dus' target='_blank'>us</a>`
   - This option cannot be chosen as answer
   - <b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination' target='_blank'>socket:tesla_destination</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)  corresponds with  `socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country!=us`
+  - <b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)  corresponds with  `socket:tesla_destination~.+&socket:tesla_destination!=1&_country!=us`
   - This option cannot be chosen as answer
   - <b>USB</b> to charge phones and small electronics  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A' target='_blank'>socket:USB-A</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>USB</b> to charge phones and small electronics  corresponds with  `socket:USB-A~^..*$&socket:USB-A!=1`
+  - <b>USB</b> to charge phones and small electronics  corresponds with  `socket:USB-A~.+&socket:USB-A!=1`
   - This option cannot be chosen as answer
   - <b>Bosch Active Connect with 3 pins</b> and cable  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:bosch_3pin' target='_blank'>socket:bosch_3pin</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:bosch_3pin%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Bosch Active Connect with 3 pins</b> and cable  corresponds with  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=1`
+  - <b>Bosch Active Connect with 3 pins</b> and cable  corresponds with  `socket:bosch_3pin~.+&socket:bosch_3pin!=1`
   - This option cannot be chosen as answer
   - <b>Bosch Active Connect with 5 pins</b> and cable  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:bosch_5pin' target='_blank'>socket:bosch_5pin</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:bosch_5pin%3D1' target='_blank'>1</a>`
   - Unselecting this answer will add 
-  - <b>Bosch Active Connect with 5 pins</b> and cable  corresponds with  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=1`
+  - <b>Bosch Active Connect with 5 pins</b> and cable  corresponds with  `socket:bosch_5pin~.+&socket:bosch_5pin!=1`
   - This option cannot be chosen as answer
 
 
@@ -308,7 +308,7 @@ This is rendered with  There are <b class='text-xl'>{socket:schuko}</b> plugs of
 
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 
 
@@ -324,7 +324,7 @@ This is rendered with  There are <b class='text-xl'>{socket:typee}</b> plugs of
 
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 
 
@@ -340,7 +340,7 @@ This is rendered with  There are <b class='text-xl'>{socket:chademo}</b> plugs o
 
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 
 
@@ -356,7 +356,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_cable}</b> plu
 
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 
 
@@ -372,7 +372,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1}</b> plugs of
 
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 
 
@@ -388,7 +388,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type1_combo}</b> plu
 
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 
 
@@ -404,7 +404,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger}<
 
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 
 
@@ -420,7 +420,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2}</b> plugs of
 
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 
 
@@ -436,7 +436,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_combo}</b> plu
 
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 
 
@@ -452,7 +452,7 @@ This is rendered with  There are <b class='text-xl'>{socket:type2_cable}</b> plu
 
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 
 
@@ -468,7 +468,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_supercharger_c
 
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 
 
@@ -484,7 +484,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 
 
@@ -500,7 +500,7 @@ This is rendered with  There are <b class='text-xl'>{socket:tesla_destination}</
 
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 
 
@@ -516,7 +516,7 @@ This is rendered with  There are <b class='text-xl'>{socket:USB-A}</b> plugs of
 
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 
 
@@ -532,7 +532,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_3pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 
 
@@ -548,7 +548,7 @@ This is rendered with  There are <b class='text-xl'>{socket:bosch_5pin}</b> plug
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 
 
@@ -569,7 +569,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:voltage' target='_blank'>socket:schuko:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -592,7 +592,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:current' target='_blank'>socket:schuko:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -615,7 +615,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Schuko wall plug
   - <b>Schuko wall plug</b> without ground pin (CEE7/4 type F) outputs at most 3.6 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:schuko:output' target='_blank'>socket:schuko:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:schuko:output%3D3.6 kW' target='_blank'>3.6 kW</a>`
 
 
-Only visible if  `socket:schuko~^..*$&socket:schuko!=0`  is shown
+Only visible if  `socket:schuko~.+&socket:schuko!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -638,7 +638,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs 230 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:voltage' target='_blank'>socket:typee:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:voltage%3D230 V' target='_blank'>230 V</a>`
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -661,7 +661,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 16 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:current' target='_blank'>socket:typee:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:current%3D16 A' target='_blank'>16 A</a>`
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -685,7 +685,7 @@ This is rendered with  <div style='display: inline-block'><b><b>European wall pl
   - <b>European wall plug</b> with ground pin (CEE7/4 type E) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:typee:output' target='_blank'>socket:typee:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:typee:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:typee~^..*$&socket:typee!=0`  is shown
+Only visible if  `socket:typee~.+&socket:typee!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -708,7 +708,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs 500 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:voltage' target='_blank'>socket:chademo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:voltage%3D500 V' target='_blank'>500 V</a>`
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -731,7 +731,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 120 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:current' target='_blank'>socket:chademo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:current%3D120 A' target='_blank'>120 A</a>`
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -754,7 +754,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Chademo</b></b>
   - <b>Chademo</b> outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:chademo:output' target='_blank'>socket:chademo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:chademo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:chademo~^..*$&socket:chademo!=0`  is shown
+Only visible if  `socket:chademo~.+&socket:chademo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -778,7 +778,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:voltage' target='_blank'>socket:type1_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -801,7 +801,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:current' target='_blank'>socket:type1_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -825,7 +825,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 with cabl
   - <b>Type 1 with cable</b> (J1772) outputs at most 7 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_cable:output' target='_blank'>socket:type1_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_cable:output%3D7 kW' target='_blank'>7 kW</a>`
 
 
-Only visible if  `socket:type1_cable~^..*$&socket:type1_cable!=0`  is shown
+Only visible if  `socket:type1_cable~.+&socket:type1_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -849,7 +849,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs 240 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:voltage' target='_blank'>socket:type1:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:voltage%3D240 V' target='_blank'>240 V</a>`
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -872,7 +872,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:current' target='_blank'>socket:type1:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -898,7 +898,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 <i>withou
   - <b>Type 1 <i>without</i> cable</b> (J1772) outputs at most 7.2 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1:output' target='_blank'>socket:type1:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1:output%3D7.2 kW' target='_blank'>7.2 kW</a>`
 
 
-Only visible if  `socket:type1~^..*$&socket:type1!=0`  is shown
+Only visible if  `socket:type1~.+&socket:type1!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -922,7 +922,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs 1000 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:voltage' target='_blank'>socket:type1_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:voltage%3D1000 V' target='_blank'>1000 V</a>`
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -946,7 +946,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 125 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:current' target='_blank'>socket:type1_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:current%3D125 A' target='_blank'>125 A</a>`
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -972,7 +972,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 1 CCS</b> (
   - <b>Type 1 CCS</b> (aka Type 1 Combo) outputs at most 350 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type1_combo:output' target='_blank'>socket:type1_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type1_combo:output%3D350 kW' target='_blank'>350 kW</a>`
 
 
-Only visible if  `socket:type1_combo~^..*$&socket:type1_combo!=0`  is shown
+Only visible if  `socket:type1_combo~.+&socket:type1_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -995,7 +995,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:voltage' target='_blank'>socket:tesla_supercharger:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1019,7 +1019,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:current' target='_blank'>socket:tesla_supercharger:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1044,7 +1044,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger:output' target='_blank'>socket:tesla_supercharger:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=0`  is shown
+Only visible if  `socket:tesla_supercharger~.+&socket:tesla_supercharger!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1068,7 +1068,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:voltage' target='_blank'>socket:type2:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1092,7 +1092,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:current' target='_blank'>socket:type2:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1116,7 +1116,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2</b> (menn
   - <b>Type 2</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2:output' target='_blank'>socket:type2:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2~^..*$&socket:type2!=0`  is shown
+Only visible if  `socket:type2~.+&socket:type2!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1140,7 +1140,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:voltage' target='_blank'>socket:type2_combo:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1164,7 +1164,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:current' target='_blank'>socket:type2_combo:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1187,7 +1187,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 CCS</b> (
   - <b>Type 2 CCS</b> (mennekes) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_combo:output' target='_blank'>socket:type2_combo:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_combo:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:type2_combo~^..*$&socket:type2_combo!=0`  is shown
+Only visible if  `socket:type2_combo~.+&socket:type2_combo!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1211,7 +1211,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:voltage' target='_blank'>socket:type2_cable:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1235,7 +1235,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:current' target='_blank'>socket:type2_cable:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1259,7 +1259,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Type 2 with cabl
   - <b>Type 2 with cable</b> (mennekes) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:type2_cable:output' target='_blank'>socket:type2_cable:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:type2_cable:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:type2_cable~^..*$&socket:type2_cable!=0`  is shown
+Only visible if  `socket:type2_cable~.+&socket:type2_cable!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1283,7 +1283,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs 920 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:voltage' target='_blank'>socket:tesla_supercharger_ccs:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:voltage%3D920 V' target='_blank'>920 V</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1307,7 +1307,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded type2_css) outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:current' target='_blank'>socket:tesla_supercharger_ccs:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1330,7 +1330,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger CCS</b> (a branded Type 2 CSS) outputs at most 50 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_supercharger_ccs:output' target='_blank'>socket:tesla_supercharger_ccs:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_supercharger_ccs:output%3D50 kW' target='_blank'>50 kW</a>`
 
 
-Only visible if  `socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=0`  is shown
+Only visible if  `socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1353,7 +1353,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs 480 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D480 V' target='_blank'>480 V</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1377,7 +1377,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 350 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D350 A' target='_blank'>350 A</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1402,7 +1402,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> outputs at most 250 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D250 kW' target='_blank'>250 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1426,7 +1426,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs 400 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:voltage' target='_blank'>socket:tesla_destination:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:voltage%3D400 V' target='_blank'>400 V</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1450,7 +1450,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 32 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:current' target='_blank'>socket:tesla_destination:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:current%3D32 A' target='_blank'>32 A</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1474,7 +1474,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Tesla Supercharg
   - <b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as Tesla) outputs at most 22 kw A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:tesla_destination:output' target='_blank'>socket:tesla_destination:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:tesla_destination:output%3D22 kW' target='_blank'>22 kW</a>`
 
 
-Only visible if  `socket:tesla_destination~^..*$&socket:tesla_destination!=0`  is shown
+Only visible if  `socket:tesla_destination~.+&socket:tesla_destination!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1497,7 +1497,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs 5 volt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:voltage' target='_blank'>socket:USB-A:voltage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:voltage%3D5 V' target='_blank'>5 V</a>`
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1521,7 +1521,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 2 A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:current' target='_blank'>socket:USB-A:current</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:current%3D2 A' target='_blank'>2 A</a>`
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1545,7 +1545,7 @@ This is rendered with  <div style='display: inline-block'><b><b>USB</b> to charg
   - <b>USB</b> to charge phones and small electronics outputs at most 10w A  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:socket:USB-A:output' target='_blank'>socket:USB-A:output</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:socket:USB-A:output%3D10W' target='_blank'>10W</a>`
 
 
-Only visible if  `socket:USB-A~^..*$&socket:USB-A!=0`  is shown
+Only visible if  `socket:USB-A~.+&socket:USB-A!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1568,7 +1568,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1591,7 +1591,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1614,7 +1614,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_3pin~^..*$&socket:bosch_3pin!=0`  is shown
+Only visible if  `socket:bosch_3pin~.+&socket:bosch_3pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1637,7 +1637,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1660,7 +1660,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1683,7 +1683,7 @@ This is rendered with  <div style='display: inline-block'><b><b>Bosch Active Con
 
 
 
-Only visible if  `socket:bosch_5pin~^..*$&socket:bosch_5pin!=0`  is shown
+Only visible if  `socket:bosch_5pin~.+&socket:bosch_5pin!=0`  is shown
 
 This tagrendering is part of group  `technical`
 
@@ -1764,7 +1764,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:membership_card' target='_blank'>payment:membership_card</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:membership_card%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~^..*$`  is shown
+Only visible if  `fee=yes|charge~.+`  is shown
 
 
 
@@ -1831,7 +1831,7 @@ This is rendered with  One can stay at most <b>{canonical(maxstay)}</b>
   - No timelimit on leaving your vehicle here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:maxstay' target='_blank'>maxstay</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:maxstay%3Dunlimited' target='_blank'>unlimited</a>`
 
 
-Only visible if  `maxstay~^..*$|motorcar=yes|hgv=yes|bus=yes`  is shown
+Only visible if  `maxstay~.+|motorcar=yes|hgv=yes|bus=yes`  is shown
 
 
 
@@ -1960,7 +1960,7 @@ This is rendered with  Reference number is <b>{ref}</b>
 
 
 
-Only visible if  `network~^..*$`  is shown
+Only visible if  `network~.+`  is shown
 
 
 
diff --git a/Docs/Layers/climbing.md b/Docs/Layers/climbing.md
index 39f2ef4ba..5395a8486 100644
--- a/Docs/Layers/climbing.md
+++ b/Docs/Layers/climbing.md
@@ -14,7 +14,7 @@ A dummy layer which contains tagrenderings, shared among the climbing layers
 
 
 
-  - This layer is shown at zoomlevel **25** and higher
+  - This layer is shown at zoomlevel **19** and higher
   - Elements don't have a title set and cannot be toggled nor will they show up in the dashboard. If you import this layer in your theme, override `title` to make this toggleable.
   - Not visible in the layer selection by default. If you want to make this layer toggable, override `name`
   - Not rendered on the map by default. If you want to rendering this on the map, override `mapRenderings`
@@ -77,7 +77,7 @@ This is rendered with  <a href='{url}' target='_blank'>{url}</a>
 
 
 
-Only visible if  `leisure!~^sports_centre$&sport=climbing`  is shown
+Only visible if  `leisure!~^(sports_centre)$&sport=climbing`  is shown
 
 
 
@@ -121,7 +121,7 @@ This is rendered with  The highest grade is {climbing:grade:french:max} accordin
 
 
 
-Only visible if  `climbing!~^route$&climbing:sport=yes|sport=climbing`  is shown
+Only visible if  `climbing!~^(route)$&climbing:sport=yes|sport=climbing`  is shown
 
 
 
@@ -138,7 +138,7 @@ The question is  Is bouldering possible here?
   - Bouldering is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dyes' target='_blank'>yes</a>`
   - Bouldering is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dno' target='_blank'>no</a>`
   - Bouldering is possible, allthough there are only a few routes  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dlimited' target='_blank'>limited</a>`
-  - There are {climbing:boulder} boulder routes  corresponds with  `climbing:boulder~^..*$`
+  - There are {climbing:boulder} boulder routes  corresponds with  `climbing:boulder~.+`
   - This option cannot be chosen as answer
 
 
@@ -156,7 +156,7 @@ The question is  Is toprope climbing possible here?
 
   - Toprope climbing is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:toprope' target='_blank'>climbing:toprope</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:toprope%3Dyes' target='_blank'>yes</a>`
   - Toprope climbing is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:toprope' target='_blank'>climbing:toprope</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:toprope%3Dno' target='_blank'>no</a>`
-  - There are {climbing:toprope} toprope routes  corresponds with  `climbing:toprope~^..*$`
+  - There are {climbing:toprope} toprope routes  corresponds with  `climbing:toprope~.+`
   - This option cannot be chosen as answer
 
 
@@ -174,7 +174,7 @@ The question is  Is sport climbing possible here on fixed anchors?
 
   - Sport climbing is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:sport' target='_blank'>climbing:sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dyes' target='_blank'>yes</a>`
   - Sport climbing is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:sport' target='_blank'>climbing:sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dno' target='_blank'>no</a>`
-  - There are {climbing:sport} sport climbing routes  corresponds with  `climbing:sport~^..*$`
+  - There are {climbing:sport} sport climbing routes  corresponds with  `climbing:sport~.+`
   - This option cannot be chosen as answer
 
 
@@ -192,7 +192,7 @@ The question is  Is traditional climbing possible here (using own gear e.g. choc
 
   - Traditional climbing is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:traditional' target='_blank'>climbing:traditional</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:traditional%3Dyes' target='_blank'>yes</a>`
   - Traditional climbing is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:traditional' target='_blank'>climbing:traditional</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:traditional%3Dno' target='_blank'>no</a>`
-  - There are {climbing:traditional} traditional climbing routes  corresponds with  `climbing:traditional~^..*$`
+  - There are {climbing:traditional} traditional climbing routes  corresponds with  `climbing:traditional~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/climbing_area.md b/Docs/Layers/climbing_area.md
index 950a2c7e3..7703d3717 100644
--- a/Docs/Layers/climbing_area.md
+++ b/Docs/Layers/climbing_area.md
@@ -42,13 +42,13 @@ Elements must have the all of following tags to be shown on this layer:
 
 
   - <a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing' target='_blank'>climbing</a>
-  - climbing!~^route$
-  - leisure!~^sports_centre$
+  - climbing!~^(route)$
+  - leisure!~^(sports_centre)$
   - climbing!=route_top
   - climbing!=route_bottom
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22sport%22%3D%22climbing%22%5D%5B%22climbing%22!~%22%5Eroute%24%22%5D%5B%22climbing%22!%3D%22route_top%22%5D%5B%22climbing%22!%3D%22route_bottom%22%5D%5B%22leisure%22!~%22%5Esports_centre%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22sport%22%3D%22climbing%22%5D%5B%22climbing%22!~%22%5E(route)%24%22%5D%5B%22climbing%22!%3D%22route_top%22%5D%5B%22climbing%22!%3D%22route_bottom%22%5D%5B%22leisure%22!~%22%5E(sports_centre)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -125,7 +125,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_contained_climbing_routes~^..*$`  is shown
+Only visible if  `_contained_climbing_routes~.+`  is shown
 
 
 
@@ -198,7 +198,7 @@ This is rendered with  <a href='{url}' target='_blank'>{url}</a>
 
 
 
-Only visible if  `leisure!~^sports_centre$&sport=climbing`  is shown
+Only visible if  `leisure!~^(sports_centre)$&sport=climbing`  is shown
 
 
 
@@ -235,7 +235,7 @@ The question is  Is bouldering possible here?
   - Bouldering is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dyes' target='_blank'>yes</a>`
   - Bouldering is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dno' target='_blank'>no</a>`
   - Bouldering is possible, allthough there are only a few routes  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dlimited' target='_blank'>limited</a>`
-  - There are {climbing:boulder} boulder routes  corresponds with  `climbing:boulder~^..*$`
+  - There are {climbing:boulder} boulder routes  corresponds with  `climbing:boulder~.+`
   - This option cannot be chosen as answer
  
 
diff --git a/Docs/Layers/climbing_club.md b/Docs/Layers/climbing_club.md
index f8b09ec5c..f1531d6a5 100644
--- a/Docs/Layers/climbing_club.md
+++ b/Docs/Layers/climbing_club.md
@@ -40,7 +40,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:club' target='_blank'>club</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:club%3Dclimbing' target='_blank'>climbing</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing' target='_blank'>climbing</a>&office~^..*$|club~^..*$
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:club' target='_blank'>club</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:club%3Dclimbing' target='_blank'>climbing</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing' target='_blank'>climbing</a>&office~.+|club~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22club%22%3D%22climbing%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22sport%22%3D%22climbing%22%5D%5B%22club%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22sport%22%3D%22climbing%22%5D%5B%22office%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
@@ -97,7 +97,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -117,7 +117,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -137,7 +137,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/climbing_gym.md b/Docs/Layers/climbing_gym.md
index 15282d8ea..e7b96cf86 100644
--- a/Docs/Layers/climbing_gym.md
+++ b/Docs/Layers/climbing_gym.md
@@ -118,7 +118,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -138,7 +138,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -158,7 +158,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -238,7 +238,7 @@ This is rendered with  The highest grade is {climbing:grade:french:max} accordin
 
 
 
-Only visible if  `climbing!~^route$&climbing:sport=yes|sport=climbing`  is shown
+Only visible if  `climbing!~^(route)$&climbing:sport=yes|sport=climbing`  is shown
 
 
 
@@ -255,7 +255,7 @@ The question is  Is bouldering possible here?
   - Bouldering is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dyes' target='_blank'>yes</a>`
   - Bouldering is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dno' target='_blank'>no</a>`
   - Bouldering is possible, allthough there are only a few routes  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:boulder' target='_blank'>climbing:boulder</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:boulder%3Dlimited' target='_blank'>limited</a>`
-  - There are {climbing:boulder} boulder routes  corresponds with  `climbing:boulder~^..*$`
+  - There are {climbing:boulder} boulder routes  corresponds with  `climbing:boulder~.+`
   - This option cannot be chosen as answer
 
 
@@ -273,7 +273,7 @@ The question is  Is sport climbing possible here on fixed anchors?
 
   - Sport climbing is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:sport' target='_blank'>climbing:sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dyes' target='_blank'>yes</a>`
   - Sport climbing is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:sport' target='_blank'>climbing:sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:sport%3Dno' target='_blank'>no</a>`
-  - There are {climbing:sport} sport climbing routes  corresponds with  `climbing:sport~^..*$`
+  - There are {climbing:sport} sport climbing routes  corresponds with  `climbing:sport~.+`
   - This option cannot be chosen as answer
 
 
@@ -307,7 +307,7 @@ The question is  Is there a speed climbing wall?
 
   - There is a speed climbing wall  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:speed' target='_blank'>climbing:speed</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:speed%3Dyes' target='_blank'>yes</a>`
   - There is no speed climbing wall  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing:speed' target='_blank'>climbing:speed</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing:speed%3Dno' target='_blank'>no</a>`
-  - There are {climbing:speed} speed climbing walls  corresponds with  `climbing:speed~^..*$`
+  - There are {climbing:speed} speed climbing walls  corresponds with  `climbing:speed~.+`
   - This option cannot be chosen as answer
  
 
diff --git a/Docs/Layers/climbing_opportunity.md b/Docs/Layers/climbing_opportunity.md
index d7df6c1e8..aebe82767 100644
--- a/Docs/Layers/climbing_opportunity.md
+++ b/Docs/Layers/climbing_opportunity.md
@@ -63,7 +63,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `name~^..*$`  is shown
+Only visible if  `name~.+`  is shown
 
 
 
@@ -79,7 +79,7 @@ The question is  Is climbing possible here?
 
   - Climbing is possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:sport' target='_blank'>sport</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing' target='_blank'>climbing</a>`
   - Climbing is not possible here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:climbing' target='_blank'>climbing</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:climbing%3Dno' target='_blank'>no</a>`
-  - Climbing is not possible here  corresponds with  `sport!~^climbing$`
+  - Climbing is not possible here  corresponds with  `sport!~^(climbing)$`
   - This option cannot be chosen as answer
  
 
diff --git a/Docs/Layers/cluster_style.md b/Docs/Layers/cluster_style.md
index 444b7596f..2c51605d2 100644
--- a/Docs/Layers/cluster_style.md
+++ b/Docs/Layers/cluster_style.md
@@ -29,7 +29,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - tileId~^..*$
+  - tileId~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22tileId%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
diff --git a/Docs/Layers/crab_address.md b/Docs/Layers/crab_address.md
index 278393137..aed1b4051 100644
--- a/Docs/Layers/crab_address.md
+++ b/Docs/Layers/crab_address.md
@@ -29,7 +29,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - HUISNR~^..*$
+  - HUISNR~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22HUISNR%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
diff --git a/Docs/Layers/cultural_places_without_etymology.md b/Docs/Layers/cultural_places_without_etymology.md
index d304a8111..1a3cdab8d 100644
--- a/Docs/Layers/cultural_places_without_etymology.md
+++ b/Docs/Layers/cultural_places_without_etymology.md
@@ -39,7 +39,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name~^..*$
+  - name~.+
   - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Darts_centre' target='_blank'>arts_centre</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcinema' target='_blank'>cinema</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre' target='_blank'>community_centre</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dlibrary' target='_blank'>library</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dtheatre' target='_blank'>theatre</a>
 
 
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/cycleways_and_roads.md b/Docs/Layers/cycleways_and_roads.md
index c768e9d89..89a89f4e4 100644
--- a/Docs/Layers/cycleways_and_roads.md
+++ b/Docs/Layers/cycleways_and_roads.md
@@ -307,7 +307,7 @@ The question is  What traffic sign does this cycleway have?
 
 
   - Compulsory cycleway  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign' target='_blank'>cycleway:traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign%3DBE:D7' target='_blank'>BE:D7</a>`
-  - Compulsory cycleway (with supplementary sign)<br>  corresponds with  `cycleway:traffic_sign~^BE:D7;.*$`
+  - Compulsory cycleway (with supplementary sign)<br>  corresponds with  `cycleway:traffic_sign~^(BE:D7;.*)$`
   - This option cannot be chosen as answer
   - Segregated foot/cycleway  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign' target='_blank'>cycleway:traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign%3DBE:D9' target='_blank'>BE:D9</a>`
   - Unsegregated foot/cycleway  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign' target='_blank'>cycleway:traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign%3DBE:D10' target='_blank'>BE:D10</a>`
@@ -329,7 +329,7 @@ The question is  What traffic sign does this cycleway have?
 
 
   - Compulsory cycleway  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DBE:D7' target='_blank'>BE:D7</a>`
-  - Compulsory cycleway (with supplementary sign)<br>  corresponds with  `traffic_sign~^BE:D7;.*$`
+  - Compulsory cycleway (with supplementary sign)<br>  corresponds with  `traffic_sign~^(BE:D7;.*)$`
   - This option cannot be chosen as answer
   - Segregated foot/cycleway  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DBE:D9' target='_blank'>BE:D9</a>`
   - Unsegregated foot/cycleway  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:traffic_sign' target='_blank'>traffic_sign</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3DBE:D10' target='_blank'>BE:D10</a>`
@@ -362,7 +362,7 @@ The question is  Does the traffic sign D7 (<img src='./assets/layers/cycleways_a
   - No supplementary traffic sign present  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:cycleway:traffic_sign:supplementary' target='_blank'>cycleway:traffic_sign:supplementary</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:cycleway:traffic_sign:supplementary%3Dnone' target='_blank'>none</a>`
 
 
-Only visible if  `cycleway:traffic_sign=BE:D7|cycleway:traffic_sign~^BE:D7;.*$`  is shown
+Only visible if  `cycleway:traffic_sign=BE:D7|cycleway:traffic_sign~^(BE:D7;.*)$`  is shown
 
 
 
diff --git a/Docs/Layers/defibrillator.md b/Docs/Layers/defibrillator.md
index 4325027ec..737f06fbf 100644
--- a/Docs/Layers/defibrillator.md
+++ b/Docs/Layers/defibrillator.md
@@ -146,7 +146,7 @@ The question is  Is this a a regular automatic defibrillator or a manual defibri
   - This option cannot be chosen as answer
   - This is a manual defibrillator for professionals  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:defibrillator' target='_blank'>defibrillator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:defibrillator%3Dmanual' target='_blank'>manual</a>`
   - This is a normal automatic defibrillator  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:defibrillator' target='_blank'>defibrillator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:defibrillator%3Dautomatic' target='_blank'>automatic</a>`
-  - This is a special type of defibrillator: {defibrillator}  corresponds with  `defibrillator~^..*$`
+  - This is a special type of defibrillator: {defibrillator}  corresponds with  `defibrillator~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/doctors.md b/Docs/Layers/doctors.md
index a9fd89ca3..003dccffb 100644
--- a/Docs/Layers/doctors.md
+++ b/Docs/Layers/doctors.md
@@ -111,7 +111,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -131,7 +131,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -151,7 +151,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/dogfoodb.md b/Docs/Layers/dogfoodb.md
index 6cd75cf01..74b4df326 100644
--- a/Docs/Layers/dogfoodb.md
+++ b/Docs/Layers/dogfoodb.md
@@ -182,7 +182,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -202,7 +202,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -222,7 +222,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -530,7 +530,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~^..*$`  is shown
+Only visible if  `internet_access!=no&internet_access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/dogshop.md b/Docs/Layers/dogshop.md
index c6a9688b2..14f324139 100644
--- a/Docs/Layers/dogshop.md
+++ b/Docs/Layers/dogshop.md
@@ -39,7 +39,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - shop~^..*$
+  - shop~.+
   - <a href='https://wiki.openstreetmap.org/wiki/Key:dog' target='_blank'>dog</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:dog%3Dleashed' target='_blank'>leashed</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:dog' target='_blank'>dog</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:dog%3Dyes' target='_blank'>yes</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:shop' target='_blank'>shop</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:shop%3Dpet' target='_blank'>pet</a>
 
 
@@ -306,7 +306,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -326,7 +326,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -346,7 +346,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -417,7 +417,7 @@ The question is  What paper formats does this shop offer?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^.*copyshop.*$|shop~^.*stationary.*$|service:print=yes`  is shown
+Only visible if  `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`  is shown
 
 
 
@@ -456,7 +456,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~^..*$`  is shown
+Only visible if  `internet_access!=no&internet_access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/drinking_water.md b/Docs/Layers/drinking_water.md
index dbc1b6361..edb475c4f 100644
--- a/Docs/Layers/drinking_water.md
+++ b/Docs/Layers/drinking_water.md
@@ -130,6 +130,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_closest_other_drinking_water_id~^..*$`  is shown 
+Only visible if  `_closest_other_drinking_water_id~.+`  is shown 
 
 This document is autogenerated from [assets/layers/drinking_water/drinking_water.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/drinking_water/drinking_water.json)
\ No newline at end of file
diff --git a/Docs/Layers/dumpstations.md b/Docs/Layers/dumpstations.md
index f3a57f9e7..5ce14853c 100644
--- a/Docs/Layers/dumpstations.md
+++ b/Docs/Layers/dumpstations.md
@@ -40,10 +40,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
   - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dsanitary_dump_station' target='_blank'>sanitary_dump_station</a>
-  - vehicle!~^no$
+  - vehicle!~^(no)$
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22sanitary_dump_station%22%5D%5B%22vehicle%22!~%22%5Eno%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22sanitary_dump_station%22%5D%5B%22vehicle%22!~%22%5E(no)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
diff --git a/Docs/Layers/education_institutions_without_etymology.md b/Docs/Layers/education_institutions_without_etymology.md
index 6068dd214..9b913cdf6 100644
--- a/Docs/Layers/education_institutions_without_etymology.md
+++ b/Docs/Layers/education_institutions_without_etymology.md
@@ -39,7 +39,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name~^..*$
+  - name~.+
   - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool' target='_blank'>school</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dkindergarten' target='_blank'>kindergarten</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Duniversity' target='_blank'>university</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcollege' target='_blank'>college</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:landuse' target='_blank'>landuse</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:landuse%3Deducation' target='_blank'>education</a>
 
 
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/entrance.md b/Docs/Layers/entrance.md
index 79f32f3cf..dabe2c018 100644
--- a/Docs/Layers/entrance.md
+++ b/Docs/Layers/entrance.md
@@ -45,7 +45,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - entrance~^..*$|<a href='https://wiki.openstreetmap.org/wiki/Key:indoor' target='_blank'>indoor</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor%3Ddoor' target='_blank'>door</a>|door~^..*$
+  - entrance~.+|<a href='https://wiki.openstreetmap.org/wiki/Key:indoor' target='_blank'>indoor</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:indoor%3Ddoor' target='_blank'>door</a>|door~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22indoor%22%3D%22door%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22door%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22entrance%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
diff --git a/Docs/Layers/etymology.md b/Docs/Layers/etymology.md
index 9e08edd96..b0f7a31e8 100644
--- a/Docs/Layers/etymology.md
+++ b/Docs/Layers/etymology.md
@@ -40,7 +40,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name:etymology:wikidata~^..*$|name:etymology~^..*$
+  - name:etymology:wikidata~.+|name:etymology~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22name%3Aetymology%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22name%3Aetymology%3Awikidata%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/layers/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/filters.md b/Docs/Layers/filters.md
new file mode 100644
index 000000000..146984c8a
--- /dev/null
+++ b/Docs/Layers/filters.md
@@ -0,0 +1,46 @@
+
+
+ filters 
+=========
+
+
+
+
+
+This layer acts as library for common filters
+
+
+
+
+
+
+  - This layer is shown at zoomlevel **0** and higher
+  - Elements don't have a title set and cannot be toggled nor will they show up in the dashboard. If you import this layer in your theme, override `title` to make this toggleable.
+  - Not visible in the layer selection by default. If you want to make this layer toggable, override `name`
+  - Not rendered on the map by default. If you want to rendering this on the map, override `mapRenderings`
+
+
+
+
+ Basic tags for this layer 
+---------------------------
+
+
+
+Elements must have the all of following tags to be shown on this layer:
+
+
+
+  - id~.+
+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22id%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+
+
+ Supported attributes 
+----------------------
+
+ 
+
+This document is autogenerated from [assets/layers/filters/filters.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/filters/filters.json)
\ No newline at end of file
diff --git a/Docs/Layers/food.md b/Docs/Layers/food.md
index f7766e789..72adb45c2 100644
--- a/Docs/Layers/food.md
+++ b/Docs/Layers/food.md
@@ -185,7 +185,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -205,7 +205,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -225,7 +225,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -533,7 +533,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~^..*$`  is shown
+Only visible if  `internet_access!=no&internet_access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/friture.md b/Docs/Layers/friture.md
index 925463afb..a09baf9b0 100644
--- a/Docs/Layers/friture.md
+++ b/Docs/Layers/friture.md
@@ -39,11 +39,11 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - cuisine~^(.*;)?friture(;.*)?$
+  - cuisine~^((.*;)?friture(;.*)?)$
   - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dfast_food' target='_blank'>fast_food</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Drestaurant' target='_blank'>restaurant</a>
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22fast_food%22%5D%5B%22cuisine%22~%22%5E(.*%3B)%3Ffriture(%3B.*)%3F%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22cuisine%22~%22%5E(.*%3B)%3Ffriture(%3B.*)%3F%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22fast_food%22%5D%5B%22cuisine%22~%22%5E((.*%3B)%3Ffriture(%3B.*)%3F)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22restaurant%22%5D%5B%22cuisine%22~%22%5E((.*%3B)%3Ffriture(%3B.*)%3F)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -182,7 +182,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -202,7 +202,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -222,7 +222,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -530,7 +530,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~^..*$`  is shown
+Only visible if  `internet_access!=no&internet_access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/governments.md b/Docs/Layers/governments.md
index d0371d10d..e55749282 100644
--- a/Docs/Layers/governments.md
+++ b/Docs/Layers/governments.md
@@ -94,7 +94,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -114,7 +114,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -134,7 +134,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/hackerspace.md b/Docs/Layers/hackerspace.md
index a95515bfc..268813eb1 100644
--- a/Docs/Layers/hackerspace.md
+++ b/Docs/Layers/hackerspace.md
@@ -132,7 +132,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -152,7 +152,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -172,7 +172,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/health_and_social_places_without_etymology.md b/Docs/Layers/health_and_social_places_without_etymology.md
index f0a09340e..f14913700 100644
--- a/Docs/Layers/health_and_social_places_without_etymology.md
+++ b/Docs/Layers/health_and_social_places_without_etymology.md
@@ -39,7 +39,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name~^..*$
+  - name~.+
   - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dclinic' target='_blank'>clinic</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dhospital' target='_blank'>hospital</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dsocial_facility' target='_blank'>social_facility</a>
 
 
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/hospital.md b/Docs/Layers/hospital.md
index a23028ef1..2d9d256a3 100644
--- a/Docs/Layers/hospital.md
+++ b/Docs/Layers/hospital.md
@@ -97,7 +97,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -117,7 +117,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -137,7 +137,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
  
 
diff --git a/Docs/Layers/hotel.md b/Docs/Layers/hotel.md
index b1e899246..760651bb2 100644
--- a/Docs/Layers/hotel.md
+++ b/Docs/Layers/hotel.md
@@ -125,7 +125,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -145,7 +145,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -165,7 +165,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -224,7 +224,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~^..*$`  is shown
+Only visible if  `internet_access!=no&internet_access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/id_presets.md b/Docs/Layers/id_presets.md
index da51ccd10..1099576b7 100644
--- a/Docs/Layers/id_presets.md
+++ b/Docs/Layers/id_presets.md
@@ -31,7 +31,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - id~^..*$
+  - id~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22id%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
diff --git a/Docs/Layers/kerbs.md b/Docs/Layers/kerbs.md
index e35174360..f1d69b13d 100644
--- a/Docs/Layers/kerbs.md
+++ b/Docs/Layers/kerbs.md
@@ -71,6 +71,18 @@ attribute | type | values which are supported by this layer
 
 
 
+### images 
+
+
+
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata`
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
 ### kerb-type 
 
 
diff --git a/Docs/Layers/kindergarten_childcare.md b/Docs/Layers/kindergarten_childcare.md
index 41b37ee6a..d924159cf 100644
--- a/Docs/Layers/kindergarten_childcare.md
+++ b/Docs/Layers/kindergarten_childcare.md
@@ -115,7 +115,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -135,7 +135,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -155,7 +155,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/lit_streets.md b/Docs/Layers/lit_streets.md
index 0e0ade82d..94d7f2d5b 100644
--- a/Docs/Layers/lit_streets.md
+++ b/Docs/Layers/lit_streets.md
@@ -38,9 +38,9 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - highway~^..*$
+  - highway~.+
   - lit!=no
-  - lit~^..*$
+  - lit~.+
   - service!=driveway
 
 
diff --git a/Docs/Layers/map.md b/Docs/Layers/map.md
index 7118c2ad3..d8ee5906f 100644
--- a/Docs/Layers/map.md
+++ b/Docs/Layers/map.md
@@ -116,6 +116,6 @@ The question is  Is the OpenStreetMap-attribution given?
   - This option cannot be chosen as answer
 
 
-Only visible if  `map_source~^(O|)pen(S|s)treet(M|m)ap$|map_source=osm|map_source=OSM`  is shown 
+Only visible if  `map_source~^((O|)pen(S|s)treet(M|m)ap)$|map_source=osm|map_source=OSM`  is shown 
 
 This document is autogenerated from [assets/layers/map/map.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/map/map.json)
\ No newline at end of file
diff --git a/Docs/Layers/maproulette.md b/Docs/Layers/maproulette.md
index 2f10db60b..028e4fb22 100644
--- a/Docs/Layers/maproulette.md
+++ b/Docs/Layers/maproulette.md
@@ -29,7 +29,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - title~^..*$
+  - title~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22title%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
@@ -84,6 +84,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `blurb~^..*$`  is shown 
+Only visible if  `blurb~.+`  is shown 
 
 This document is autogenerated from [assets/layers/maproulette/maproulette.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/maproulette/maproulette.json)
\ No newline at end of file
diff --git a/Docs/Layers/maproulette_challenge.md b/Docs/Layers/maproulette_challenge.md
index f7a7157a4..2d0f413ef 100644
--- a/Docs/Layers/maproulette_challenge.md
+++ b/Docs/Layers/maproulette_challenge.md
@@ -42,7 +42,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - mr_taskId~^..*$
+  - mr_taskId~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22mr_taskId%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
@@ -107,6 +107,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `blurb~^..*$`  is shown 
+Only visible if  `blurb~.+`  is shown 
 
 This document is autogenerated from [assets/layers/maproulette_challenge/maproulette_challenge.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/maproulette_challenge/maproulette_challenge.json)
\ No newline at end of file
diff --git a/Docs/Layers/named_streets.md b/Docs/Layers/named_streets.md
index 52a0c6a8b..ac64b90f6 100644
--- a/Docs/Layers/named_streets.md
+++ b/Docs/Layers/named_streets.md
@@ -34,8 +34,8 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - highway~^..*$
-  - name~^..*$
+  - highway~.+
+  - name~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22name%22%5D%5B%22highway%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
diff --git a/Docs/Layers/nature_reserve.md b/Docs/Layers/nature_reserve.md
index 9a511f64a..69dd7615f 100644
--- a/Docs/Layers/nature_reserve.md
+++ b/Docs/Layers/nature_reserve.md
@@ -126,7 +126,7 @@ This is rendered with  Operated by {operator}
 
 
   - Operated by Natuurpunt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:operator' target='_blank'>operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:operator%3DNatuurpunt' target='_blank'>Natuurpunt</a>`
-  - Operated by {operator}  corresponds with  `operator~^(n|N)atuurpunt.*$`
+  - Operated by {operator}  corresponds with  `operator~^((n|N)atuurpunt.*)$`
   - This option cannot be chosen as answer
   - Operated by <i>Agentschap Natuur en Bos</i>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:operator' target='_blank'>operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:operator%3DAgentschap Natuur en Bos' target='_blank'>Agentschap Natuur en Bos</a>`
 
@@ -185,7 +185,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -275,7 +275,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Shows a wikipedia box with the corresponding wikipedia article
+Shows a wikipedia box with the corresponding wikipedia article; the wikidata-item link can be changed by a contributor
 
 The question is  What is the corresponding Wikidata entity?
 
@@ -287,7 +287,7 @@ This is rendered with  {wikipedia():max-height:25rem}
 
 
 
-  - {wikipedia():max-height:25rem}  corresponds with  `wikipedia~^..*$`
+  - {wikipedia():max-height:25rem}  corresponds with  `wikipedia~.+`
   - This option cannot be chosen as answer
   - No Wikipedia page has been linked yet  corresponds with  ``
   - This option cannot be chosen as answer
diff --git a/Docs/Layers/observation_tower.md b/Docs/Layers/observation_tower.md
index 051e15cff..e4f3b2ba8 100644
--- a/Docs/Layers/observation_tower.md
+++ b/Docs/Layers/observation_tower.md
@@ -172,7 +172,7 @@ The question is  Which methods of payment are accepted here?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:payment:cards' target='_blank'>payment:cards</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:payment:cards%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `fee=yes|charge~^..*$`  is shown
+Only visible if  `fee=yes|charge~.+`  is shown
 
 
 
@@ -190,7 +190,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -268,7 +268,7 @@ Only visible if  `elevator=yes&access=yes|access=guided`  is shown
 
 
 
-Shows a wikipedia box with the corresponding wikipedia article
+Shows a wikipedia box with the corresponding wikipedia article; the wikidata-item link can be changed by a contributor
 
 The question is  What is the corresponding Wikidata entity?
 
@@ -280,7 +280,7 @@ This is rendered with  {wikipedia():max-height:25rem}
 
 
 
-  - {wikipedia():max-height:25rem}  corresponds with  `wikipedia~^..*$`
+  - {wikipedia():max-height:25rem}  corresponds with  `wikipedia~.+`
   - This option cannot be chosen as answer
   - No Wikipedia page has been linked yet  corresponds with  ``
   - This option cannot be chosen as answer
diff --git a/Docs/Layers/osm_community_index.md b/Docs/Layers/osm_community_index.md
new file mode 100644
index 000000000..f2c0d4485
--- /dev/null
+++ b/Docs/Layers/osm_community_index.md
@@ -0,0 +1,83 @@
+
+
+ osm_community_index 
+=====================
+
+
+
+<img src='https://mapcomplete.osm.be/pin:#6BC4F7;./assets/layers/osm_community_index/osm.svg' height="100px"> 
+
+A layer showing the OpenStreetMap Communities
+
+
+
+
+
+
+  - This layer is shown at zoomlevel **0** and higher
+  - <img src='../warning.svg' height='1rem'/> This layer is loaded from an external source, namely  `https://raw.githubusercontent.com/osmlab/osm-community-index/main/dist/completeFeatureCollection.json`
+
+
+
+
+#### Themes using this layer 
+
+
+
+
+
+  - [osm_community_index](https://mapcomplete.osm.be/osm_community_index)
+
+
+
+
+ Basic tags for this layer 
+---------------------------
+
+
+
+Elements must have the all of following tags to be shown on this layer:
+
+
+
+  - resources~.+
+
+
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22resources%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+
+
+
+ Supported attributes 
+----------------------
+
+
+
+
+
+### country_name 
+
+
+
+The name of the country
+
+This tagrendering has no question and is thus read-only
+
+
+
+Only visible if  `level=country`  is shown
+
+
+
+### community_links 
+
+
+
+Community Links (Discord, meetups, Slack groups, IRC channels, mailing lists etc...)
+
+This tagrendering has no question and is thus read-only
+
+
+
+Only visible if  `_community_links~.+`  is shown 
+
+This document is autogenerated from [assets/layers/osm_community_index/osm_community_index.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/osm_community_index/osm_community_index.json)
\ No newline at end of file
diff --git a/Docs/Layers/parking_spaces.md b/Docs/Layers/parking_spaces.md
index db640117e..88c3427e1 100644
--- a/Docs/Layers/parking_spaces.md
+++ b/Docs/Layers/parking_spaces.md
@@ -14,7 +14,7 @@ Layer showing individual parking spaces.
 
 
 
-  - This layer is shown at zoomlevel **20** and higher
+  - This layer is shown at zoomlevel **19** and higher
 
 
 
diff --git a/Docs/Layers/parks_and_forests_without_etymology.md b/Docs/Layers/parks_and_forests_without_etymology.md
index dd6d08a10..ddb930fd0 100644
--- a/Docs/Layers/parks_and_forests_without_etymology.md
+++ b/Docs/Layers/parks_and_forests_without_etymology.md
@@ -39,7 +39,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name~^..*$
+  - name~.+
   - <a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dpark' target='_blank'>park</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:landuse' target='_blank'>landuse</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:landuse%3Dforest' target='_blank'>forest</a>
 
 
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/pharmacy.md b/Docs/Layers/pharmacy.md
index e87795e88..daa371acf 100644
--- a/Docs/Layers/pharmacy.md
+++ b/Docs/Layers/pharmacy.md
@@ -126,7 +126,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -146,7 +146,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -166,7 +166,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/play_forest.md b/Docs/Layers/play_forest.md
index e01e5b334..77ed06167 100644
--- a/Docs/Layers/play_forest.md
+++ b/Docs/Layers/play_forest.md
@@ -82,7 +82,7 @@ This is rendered with  Dit gebied wordt beheerd door {operator}
 
 
 
-  - Dit gebied wordt beheerd door het <a href='https://www.natuurenbos.be/spelen'>Agentschap Natuur en Bos</a>  corresponds with  `operator~^[aA][nN][bB]$`
+  - Dit gebied wordt beheerd door het <a href='https://www.natuurenbos.be/spelen'>Agentschap Natuur en Bos</a>  corresponds with  `operator~^([aA][nN][bB])$`
   - This option cannot be chosen as answer
   - Dit gebied wordt beheerd door het <a href='https://www.natuurenbos.be/spelen'>Agentschap Natuur en Bos</a>  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:operator' target='_blank'>operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:operator%3DAgenstchap Natuur en Bos' target='_blank'>Agenstchap Natuur en Bos</a>`
 
diff --git a/Docs/Layers/playground.md b/Docs/Layers/playground.md
index 958dc54e5..945d9bb88 100644
--- a/Docs/Layers/playground.md
+++ b/Docs/Layers/playground.md
@@ -214,7 +214,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/public_bookcase.md b/Docs/Layers/public_bookcase.md
index bd9e97f96..3abff0fe6 100644
--- a/Docs/Layers/public_bookcase.md
+++ b/Docs/Layers/public_bookcase.md
@@ -226,7 +226,7 @@ This is rendered with  The reference number of this public bookcase within {bran
   - This bookcase is not part of a bigger network  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:nobrand' target='_blank'>nobrand</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:nobrand%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `brand~^..*$`  is shown
+Only visible if  `brand~.+`  is shown
 
 
 
diff --git a/Docs/Layers/recycling.md b/Docs/Layers/recycling.md
index 77e580f2f..1c65674e7 100644
--- a/Docs/Layers/recycling.md
+++ b/Docs/Layers/recycling.md
@@ -226,7 +226,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -248,7 +248,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -270,7 +270,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/school.md b/Docs/Layers/school.md
index eb7df39c7..5545b7cda 100644
--- a/Docs/Layers/school.md
+++ b/Docs/Layers/school.md
@@ -170,7 +170,7 @@ This is rendered with  This school has facilities for students with {school:for}
   - This is a school for students with special needs  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:school:for' target='_blank'>school:for</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:school:for%3Dspecial_needs' target='_blank'>special_needs</a>`
 
 
-Only visible if  `school:for~^..*$`  is shown
+Only visible if  `school:for~.+`  is shown
 
 
 
@@ -188,7 +188,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -208,7 +208,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -228,7 +228,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/shops.md b/Docs/Layers/shops.md
index a7f6b83a2..8c315bd33 100644
--- a/Docs/Layers/shops.md
+++ b/Docs/Layers/shops.md
@@ -42,7 +42,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - shop~^..*$
+  - shop~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22shop%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
@@ -308,7 +308,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -328,7 +328,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -348,7 +348,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
@@ -419,7 +419,7 @@ The question is  What paper formats does this shop offer?
   - Unselecting this answer will add <a href='https://wiki.openstreetmap.org/wiki/Key:service:print:A0' target='_blank'>service:print:A0</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:print:A0%3Dno' target='_blank'>no</a>
 
 
-Only visible if  `shop~^.*copyshop.*$|shop~^.*stationary.*$|service:print=yes`  is shown
+Only visible if  `shop~^(.*copyshop.*)$|shop~^(.*stationary.*)$|service:print=yes`  is shown
 
 
 
@@ -458,7 +458,7 @@ The question is  Is there a fee for internet access?
   - Internet access is free at this place, for customers only  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:internet_access:fee' target='_blank'>internet_access:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:internet_access:fee%3Dcustomers' target='_blank'>customers</a>`
 
 
-Only visible if  `internet_access!=no&internet_access~^..*$`  is shown
+Only visible if  `internet_access!=no&internet_access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/sport_pitch.md b/Docs/Layers/sport_pitch.md
index 62291e306..e76ec5524 100644
--- a/Docs/Layers/sport_pitch.md
+++ b/Docs/Layers/sport_pitch.md
@@ -216,7 +216,7 @@ This is rendered with  Openingsuren: {opening_hours_table()}
   - Always accessible  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:opening_hours' target='_blank'>opening_hours</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:opening_hours%3D24/7' target='_blank'>24/7</a>`
 
 
-Only visible if  `access~^..*$`  is shown
+Only visible if  `access~.+`  is shown
 
 
 
diff --git a/Docs/Layers/sport_places_without_etymology.md b/Docs/Layers/sport_places_without_etymology.md
index 0406c941e..8aee3170c 100644
--- a/Docs/Layers/sport_places_without_etymology.md
+++ b/Docs/Layers/sport_places_without_etymology.md
@@ -39,7 +39,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name~^..*$
+  - name~.+
   - <a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dsports_centre' target='_blank'>sports_centre</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dstadium' target='_blank'>stadium</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:leisure' target='_blank'>leisure</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leisure%3Dswimming_pool' target='_blank'>swimming_pool</a>
 
 
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/streets_without_etymology.md b/Docs/Layers/streets_without_etymology.md
index b6fd5eeb3..ef70dc49f 100644
--- a/Docs/Layers/streets_without_etymology.md
+++ b/Docs/Layers/streets_without_etymology.md
@@ -39,8 +39,8 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name~^..*$
-  - highway~^..*$
+  - name~.+
+  - highway~.+
   - highway!=bus_stop
 
 
@@ -168,6 +168,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/surveillance_camera.md b/Docs/Layers/surveillance_camera.md
index 511eaafa8..052f7e6b6 100644
--- a/Docs/Layers/surveillance_camera.md
+++ b/Docs/Layers/surveillance_camera.md
@@ -117,7 +117,7 @@ This is rendered with  Films to a compass heading of {camera:direction}
 
 
 
-  - Films to a compass heading of {direction}  corresponds with  `direction~^..*$`
+  - Films to a compass heading of {direction}  corresponds with  `direction~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/tertiary_education.md b/Docs/Layers/tertiary_education.md
index c729522de..be84ce2e8 100644
--- a/Docs/Layers/tertiary_education.md
+++ b/Docs/Layers/tertiary_education.md
@@ -40,10 +40,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcollege' target='_blank'>college</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Duniversity' target='_blank'>university</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool' target='_blank'>school</a>&isced:2011:level~^.*bachelor.*$|isced:2011:level~^.*master.*$
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcollege' target='_blank'>college</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Duniversity' target='_blank'>university</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:amenity' target='_blank'>amenity</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:amenity%3Dschool' target='_blank'>school</a>&isced:2011:level~^(.*bachelor.*)$|isced:2011:level~^(.*master.*)$
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22college%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22university%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22school%22%5D%5B%22isced%3A2011%3Alevel%22~%22%5E.*bachelor.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22school%22%5D%5B%22isced%3A2011%3Alevel%22~%22%5E.*master.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22amenity%22%3D%22college%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22university%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22school%22%5D%5B%22isced%3A2011%3Alevel%22~%22%5E(.*bachelor.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22amenity%22%3D%22school%22%5D%5B%22isced%3A2011%3Alevel%22~%22%5E(.*master.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -152,7 +152,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -172,7 +172,7 @@ This is rendered with  <a href='mailto:{email}' target='_blank'>{email}</a>
 
 
 
-  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~^..*$`
+  - <a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>  corresponds with  `contact:email~.+`
   - This option cannot be chosen as answer
 
 
@@ -192,7 +192,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
  
 
diff --git a/Docs/Layers/toursistic_places_without_etymology.md b/Docs/Layers/toursistic_places_without_etymology.md
index e4b327f35..b7be18271 100644
--- a/Docs/Layers/toursistic_places_without_etymology.md
+++ b/Docs/Layers/toursistic_places_without_etymology.md
@@ -39,7 +39,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - name~^..*$
+  - name~.+
   - <a href='https://wiki.openstreetmap.org/wiki/Key:tourism' target='_blank'>tourism</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tourism%3Daquarium' target='_blank'>aquarium</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:tourism' target='_blank'>tourism</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dmuseum' target='_blank'>museum</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:tourism' target='_blank'>tourism</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dtheme_park' target='_blank'>theme_park</a>|<a href='https://wiki.openstreetmap.org/wiki/Key:tourism' target='_blank'>tourism</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:tourism%3Dzoo' target='_blank'>zoo</a>
 
 
@@ -167,6 +167,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikidata~^..*$`  is shown 
+Only visible if  `wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/themes/etymology/etymology.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/themes/etymology/etymology.json)
\ No newline at end of file
diff --git a/Docs/Layers/trail.md b/Docs/Layers/trail.md
index a81623dfa..ca1fb44e6 100644
--- a/Docs/Layers/trail.md
+++ b/Docs/Layers/trail.md
@@ -28,10 +28,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - route~^.*foot.*$|route~^.*hiking.*$|route~^.*bycicle.*$|route~^.*horse.*$
+  - route~^(.*foot.*)$|route~^(.*hiking.*)$|route~^(.*bycicle.*)$|route~^(.*horse.*)$
 
 
-[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22route%22~%22%5E.*foot.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22route%22~%22%5E.*hiking.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22route%22~%22%5E.*bycicle.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22route%22~%22%5E.*horse.*%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
+[Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22route%22~%22%5E(.*foot.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22route%22~%22%5E(.*hiking.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22route%22~%22%5E(.*bycicle.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22route%22~%22%5E(.*horse.*)%24%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
 
 
 
@@ -108,7 +108,7 @@ This is rendered with  Beheer door {operator}
 
 
   - Dit gebied wordt beheerd door Natuurpunt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:operator' target='_blank'>operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:operator%3DNatuurpunt' target='_blank'>Natuurpunt</a>`
-  - Dit gebied wordt beheerd door {operator}  corresponds with  `operator~^(n|N)atuurpunt.*$`
+  - Dit gebied wordt beheerd door {operator}  corresponds with  `operator~^((n|N)atuurpunt.*)$`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/transit_stops.md b/Docs/Layers/transit_stops.md
index fc1899f9d..251d1e3d2 100644
--- a/Docs/Layers/transit_stops.md
+++ b/Docs/Layers/transit_stops.md
@@ -237,6 +237,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_contained_routes~^..*$`  is shown 
+Only visible if  `_contained_routes~.+`  is shown 
 
 This document is autogenerated from [assets/layers/transit_stops/transit_stops.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/transit_stops/transit_stops.json)
\ No newline at end of file
diff --git a/Docs/Layers/tree_node.md b/Docs/Layers/tree_node.md
index f4df785e3..185f587a1 100644
--- a/Docs/Layers/tree_node.md
+++ b/Docs/Layers/tree_node.md
@@ -95,10 +95,10 @@ This tagrendering has no question and is thus read-only
 
 
 
-  - Height: {height}&nbsp;m  corresponds with  `height~^^[0-9.]+$$`
+  - Height: {height}&nbsp;m  corresponds with  `height~^(^[0-9.]+$)$`
 
 
-Only visible if  `height~^..*$`  is shown
+Only visible if  `height~.+`  is shown
 
 
 
@@ -134,7 +134,7 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikipedia~^..*$|wikidata~^..*$`  is shown
+Only visible if  `wikipedia~.+|wikidata~.+`  is shown
 
 
 
@@ -211,7 +211,7 @@ This is rendered with  Name: {name}
   - The tree does not have a name.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:noname' target='_blank'>noname</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:noname%3Dyes' target='_blank'>yes</a>`
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument|name~^..*$`  is shown
+Only visible if  `denotation=landmark|denotation=natural_monument|name~.+`  is shown
 
 
 
@@ -229,7 +229,7 @@ The question is  Is this tree registered heritage?
   - Registered as heritage by <i>Direction du Patrimoine culturel</i> Brussels  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:heritage' target='_blank'>heritage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:heritage%3D4' target='_blank'>4</a>&<a href='https://wiki.openstreetmap.org/wiki/Key:heritage:operator' target='_blank'>heritage:operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:heritage:operator%3Daatl' target='_blank'>aatl</a>`
   - Registered as heritage by a different organisation  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:heritage' target='_blank'>heritage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:heritage%3Dyes' target='_blank'>yes</a>`
   - Not registered as heritage  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:heritage' target='_blank'>heritage</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:heritage%3Dno' target='_blank'>no</a>`
-  - Registered as heritage by a different organisation  corresponds with  `heritage~^..*$`
+  - Registered as heritage by a different organisation  corresponds with  `heritage~.+`
   - This option cannot be chosen as answer
 
 
@@ -265,6 +265,6 @@ This is rendered with  <img src="./assets/svg/wikidata.svg" style="width:1em;hei
 
 
 
-Only visible if  `denotation=landmark|denotation=natural_monument|wikidata~^..*$`  is shown 
+Only visible if  `denotation=landmark|denotation=natural_monument|wikidata~.+`  is shown 
 
 This document is autogenerated from [assets/layers/tree_node/tree_node.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/tree_node/tree_node.json)
\ No newline at end of file
diff --git a/Docs/Layers/veterinary.md b/Docs/Layers/veterinary.md
index 16d0b7569..de2582070 100644
--- a/Docs/Layers/veterinary.md
+++ b/Docs/Layers/veterinary.md
@@ -82,7 +82,7 @@ This is rendered with  <a href='{website}' target='_blank'>{website}</a>
 
 
 
-  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~^..*$`
+  - <a href='{contact:website}' target='_blank'>{contact:website}</a>  corresponds with  `contact:website~.+`
   - This option cannot be chosen as answer
 
 
@@ -114,7 +114,7 @@ This is rendered with  <a href='tel:{phone}'>{phone}</a>
 
 
 
-  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~^..*$`
+  - <a href='tel:{contact:phone}'>{contact:phone}</a>  corresponds with  `contact:phone~.+`
   - This option cannot be chosen as answer
 
 
diff --git a/Docs/Layers/walls_and_buildings.md b/Docs/Layers/walls_and_buildings.md
index 5f5a8915e..6f44f5f08 100644
--- a/Docs/Layers/walls_and_buildings.md
+++ b/Docs/Layers/walls_and_buildings.md
@@ -51,7 +51,7 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - <a href='https://wiki.openstreetmap.org/wiki/Key:barrier' target='_blank'>barrier</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall' target='_blank'>wall</a>|building~^..*$
+  - <a href='https://wiki.openstreetmap.org/wiki/Key:barrier' target='_blank'>barrier</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:barrier%3Dwall' target='_blank'>wall</a>|building~.+
 
 
 [Execute on overpass](http://overpass-turbo.eu/?Q=%5Bout%3Ajson%5D%5Btimeout%3A90%5D%3B(%20%20%20%20nwr%5B%22barrier%22%3D%22wall%22%5D(%7B%7Bbbox%7D%7D)%3B%0A%20%20%20%20nwr%5B%22building%22%5D(%7B%7Bbbox%7D%7D)%3B%0A)%3Bout%20body%3B%3E%3Bout%20skel%20qt%3B)
@@ -89,6 +89,6 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `_biggest_width_id~^..*$`  is shown 
+Only visible if  `_biggest_width_id~.+`  is shown 
 
 This document is autogenerated from [assets/layers/walls_and_buildings/walls_and_buildings.json](https://github.com/pietervdvn/MapComplete/blob/develop/assets/layers/walls_and_buildings/walls_and_buildings.json)
\ No newline at end of file
diff --git a/Docs/Layers/watermill.md b/Docs/Layers/watermill.md
index 5340e87ba..25de35d44 100644
--- a/Docs/Layers/watermill.md
+++ b/Docs/Layers/watermill.md
@@ -105,7 +105,7 @@ This is rendered with  Beheer door {operator}
 
 
   - Dit gebied wordt beheerd door Natuurpunt  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:operator' target='_blank'>operator</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:operator%3DNatuurpunt' target='_blank'>Natuurpunt</a>`
-  - Dit gebied wordt beheerd door {operator}  corresponds with  `operator~^(n|N)atuurpunt.*$`
+  - Dit gebied wordt beheerd door {operator}  corresponds with  `operator~^((n|N)atuurpunt.*)$`
   - This option cannot be chosen as answer
  
 
diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md
index 87ca2d6f8..11fa39bfe 100644
--- a/Docs/SpecialRenderings.md
+++ b/Docs/SpecialRenderings.md
@@ -199,7 +199,7 @@ keyToShowWikidataFor | wikidata | Use the wikidata entry from this key to show t
 name | default | description
 ------ | --------- | -------------
 zoomlevel | 18 | The (maximum) zoomlevel: the target zoomlevel after fitting the entire feature. The minimap will fit the entire feature, then zoom out to this zoom level. The higher, the more zoomed in with 1 being the entire world and 19 being really close
-idKey | id | (Matches all resting arguments) This argument should be the key of a property of the feature. The corresponding value is interpreted as either the id or the a list of ID's. The features with these ID's will be shown on this minimap.
+idKey | id | (Matches all resting arguments) This argument should be the key of a property of the feature. The corresponding value is interpreted as either the id or the a list of ID's. The features with these ID's will be shown on this minimap. (Note: if the key is 'id', list interpration is disabled)
  
 
 #### Example usage of minimap 
@@ -332,8 +332,8 @@ It is only functional in official themes, but can be tested in unoffical themes.
 
 The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties).
 
-These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. 
-This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. 
+These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`.
+This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature.
 
 If a value to substitute is undefined, empty string will be used instead.
 
@@ -359,11 +359,11 @@ There are also some technicalities in your theme to keep in mind:
     This should be used to change the appearance or even to hide it (eg by changing the icon size to zero)
 3. There should be a way for the theme to detect previously imported points, even after reloading.
     A reference number to the original dataset is an excellent way to do this
-4. When importing ways, the theme creator is also responsible of avoiding overlapping ways. 
-    
+4. When importing ways, the theme creator is also responsible of avoiding overlapping ways.
+
 #### Disabled in unofficial themes
 
-The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md). 
+The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md).
 The import button will show up then. If in testmode, you can read the changeset-XML directly in the web console.
 In the case that MapComplete is pointed to the testing grounds, the edit will be made on https://master.apis.dev.openstreetmap.org
  
@@ -398,8 +398,8 @@ It is only functional in official themes, but can be tested in unoffical themes.
 
 The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties).
 
-These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. 
-This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. 
+These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`.
+This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature.
 
 If a value to substitute is undefined, empty string will be used instead.
 
@@ -425,11 +425,11 @@ There are also some technicalities in your theme to keep in mind:
     This should be used to change the appearance or even to hide it (eg by changing the icon size to zero)
 3. There should be a way for the theme to detect previously imported points, even after reloading.
     A reference number to the original dataset is an excellent way to do this
-4. When importing ways, the theme creator is also responsible of avoiding overlapping ways. 
-    
+4. When importing ways, the theme creator is also responsible of avoiding overlapping ways.
+
 #### Disabled in unofficial themes
 
-The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md). 
+The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md).
 The import button will show up then. If in testmode, you can read the changeset-XML directly in the web console.
 In the case that MapComplete is pointed to the testing grounds, the edit will be made on https://master.apis.dev.openstreetmap.org
  
@@ -465,8 +465,8 @@ It is only functional in official themes, but can be tested in unoffical themes.
 
 The argument `tags` of the import button takes a `;`-seperated list of tags to add (or the name of a property which contains a JSON-list of properties).
 
-These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. 
-This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. 
+These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`.
+This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature.
 
 If a value to substitute is undefined, empty string will be used instead.
 
@@ -492,11 +492,11 @@ There are also some technicalities in your theme to keep in mind:
     This should be used to change the appearance or even to hide it (eg by changing the icon size to zero)
 3. There should be a way for the theme to detect previously imported points, even after reloading.
     A reference number to the original dataset is an excellent way to do this
-4. When importing ways, the theme creator is also responsible of avoiding overlapping ways. 
-    
+4. When importing ways, the theme creator is also responsible of avoiding overlapping ways.
+
 #### Disabled in unofficial themes
 
-The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md). 
+The import button can be tested in an unofficial theme by adding `test=true` or `backend=osm-test` as [URL-paramter](URL_Parameters.md).
 The import button will show up then. If in testmode, you can read the changeset-XML directly in the web console.
 In the case that MapComplete is pointed to the testing grounds, the edit will be made on https://master.apis.dev.openstreetmap.org
  
@@ -540,8 +540,8 @@ overwrite | _undefined_ | If set to 'true', the tags on the other objects will a
  Shows a big button; clicking this button will apply certain tags onto the feature.
 
 The first argument takes a specification of which tags to add.
-These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`. 
-This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature. 
+These can either be a tag to add, such as `amenity=fast_food` or can use a substitution, e.g. `addr:housenumber=$number`.
+This new point will then have the tags `amenity=fast_food` and `addr:housenumber` with the value that was saved in `number` in the original feature.
 
 If a value to substitute is undefined, empty string will be used instead.
 
@@ -788,7 +788,8 @@ tagrendering | _undefined_ | An entire tagRenderingConfig
       }
     }
   }
-}```
+}
+```
 
 
 
diff --git a/Docs/TagInfo/mapcomplete_aed.json b/Docs/TagInfo/mapcomplete_aed.json
index 59966fc7e..a44cd4dbf 100644
--- a/Docs/TagInfo/mapcomplete_aed.json
+++ b/Docs/TagInfo/mapcomplete_aed.json
@@ -87,7 +87,7 @@
     },
     {
       "key": "defibrillator",
-      "description": "Layer 'Defibrillators' shows defibrillator~^..*$ with a fixed text, namely 'This is a special type of defibrillator: {defibrillator}' (in the MapComplete.osm.be theme 'Open AED Map')"
+      "description": "Layer 'Defibrillators' shows defibrillator~.+ with a fixed text, namely 'This is a special type of defibrillator: {defibrillator}' (in the MapComplete.osm.be theme 'Open AED Map')"
     },
     {
       "key": "level",
diff --git a/Docs/TagInfo/mapcomplete_artwork.json b/Docs/TagInfo/mapcomplete_artwork.json
index 5fcb00d4b..d61cbd92b 100644
--- a/Docs/TagInfo/mapcomplete_artwork.json
+++ b/Docs/TagInfo/mapcomplete_artwork.json
@@ -95,6 +95,15 @@
       "description": "Layer 'Artworks' shows artwork_type=tilework with a fixed text, namely 'Tilework' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
       "value": "tilework"
     },
+    {
+      "key": "artwork_type",
+      "description": "Layer 'Artworks' shows artwork_type=woodcarving with a fixed text, namely 'Woodcarving' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Artwork Map')",
+      "value": "woodcarving"
+    },
+    {
+      "key": "artist:wikidata",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'artist:wikidata' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
     {
       "key": "artist_name",
       "description": "Layer 'Artworks' shows and asks freeform values for key 'artist_name' (in the MapComplete.osm.be theme 'Open Artwork Map')"
@@ -106,6 +115,19 @@
     {
       "key": "wikidata",
       "description": "Layer 'Artworks' shows and asks freeform values for key 'wikidata' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "wikipedia",
+      "description": "Layer 'Artworks' shows wikipedia~.+ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Open Artwork Map')"
+    },
+    {
+      "key": "wikidata",
+      "description": "Layer 'Artworks' shows  with a fixed text, namely 'No Wikipedia page has been linked yet' (in the MapComplete.osm.be theme 'Open Artwork Map') Picking this answer will delete the key wikidata.",
+      "value": ""
+    },
+    {
+      "key": "subject:wikidata",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'subject:wikidata' (in the MapComplete.osm.be theme 'Open Artwork Map')"
     }
   ]
 }
\ No newline at end of file
diff --git a/Docs/TagInfo/mapcomplete_bicycle_rental.json b/Docs/TagInfo/mapcomplete_bicycle_rental.json
index aa0c396be..3e9c1905a 100644
--- a/Docs/TagInfo/mapcomplete_bicycle_rental.json
+++ b/Docs/TagInfo/mapcomplete_bicycle_rental.json
@@ -90,7 +90,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bicycle rental' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Bicycle rental')"
+      "description": "Layer 'Bicycle rental' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Bicycle rental')"
     },
     {
       "key": "email",
@@ -98,7 +98,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.osm.be theme 'Bicycle rental')"
+      "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.osm.be theme 'Bicycle rental')"
     },
     {
       "key": "phone",
@@ -106,7 +106,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bicycle rental' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Bicycle rental')"
+      "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Bicycle rental')"
     },
     {
       "key": "opening_hours",
diff --git a/Docs/TagInfo/mapcomplete_bicyclelib.json b/Docs/TagInfo/mapcomplete_bicyclelib.json
index 7d3504eba..d14d0b277 100644
--- a/Docs/TagInfo/mapcomplete_bicyclelib.json
+++ b/Docs/TagInfo/mapcomplete_bicyclelib.json
@@ -41,7 +41,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bicycle library' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Bicycle libraries')"
+      "description": "Layer 'Bicycle library' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Bicycle libraries')"
     },
     {
       "key": "phone",
@@ -49,7 +49,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bicycle library' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Bicycle libraries')"
+      "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Bicycle libraries')"
     },
     {
       "key": "email",
@@ -57,7 +57,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.osm.be theme 'Bicycle libraries')"
+      "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.osm.be theme 'Bicycle libraries')"
     },
     {
       "key": "opening_hours",
diff --git a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
index 507eb9d8d..77da43e7d 100644
--- a/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
+++ b/Docs/TagInfo/mapcomplete_cafes_and_pubs.json
@@ -124,7 +124,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Cafés and pubs' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
+      "description": "Layer 'Cafés and pubs' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
     },
     {
       "key": "email",
@@ -132,7 +132,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.osm.be 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'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
     },
     {
       "key": "phone",
@@ -140,7 +140,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Cafés and pubs' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
+      "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cafés and pubs')"
     },
     {
       "key": "payment:cash",
diff --git a/Docs/TagInfo/mapcomplete_charging_stations.json b/Docs/TagInfo/mapcomplete_charging_stations.json
index b3137e3e8..2a6d13407 100644
--- a/Docs/TagInfo/mapcomplete_charging_stations.json
+++ b/Docs/TagInfo/mapcomplete_charging_stations.json
@@ -116,7 +116,7 @@
     },
     {
       "key": "socket:schuko",
-      "description": "Layer 'Charging stations' shows socket:schuko~^..*$&socket:schuko!=1 with a fixed text, namely '<b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:schuko~.+&socket:schuko!=1 with a fixed text, namely '<b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:typee",
@@ -125,7 +125,7 @@
     },
     {
       "key": "socket:typee",
-      "description": "Layer 'Charging stations' shows socket:typee~^..*$&socket:typee!=1 with a fixed text, namely '<b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:typee~.+&socket:typee!=1 with a fixed text, namely '<b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:chademo",
@@ -134,7 +134,7 @@
     },
     {
       "key": "socket:chademo",
-      "description": "Layer 'Charging stations' shows socket:chademo~^..*$&socket:chademo!=1 with a fixed text, namely '<b>Chademo</b>' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:chademo~.+&socket:chademo!=1 with a fixed text, namely '<b>Chademo</b>' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:type1_cable",
@@ -143,7 +143,7 @@
     },
     {
       "key": "socket:type1_cable",
-      "description": "Layer 'Charging stations' shows socket:type1_cable~^..*$&socket:type1_cable!=1 with a fixed text, namely '<b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:type1_cable~.+&socket:type1_cable!=1 with a fixed text, namely '<b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:type1",
@@ -152,7 +152,7 @@
     },
     {
       "key": "socket:type1",
-      "description": "Layer 'Charging stations' shows socket:type1~^..*$&socket:type1!=1 with a fixed text, namely '<b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:type1~.+&socket:type1!=1 with a fixed text, namely '<b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:type1_combo",
@@ -161,7 +161,7 @@
     },
     {
       "key": "socket:type1_combo",
-      "description": "Layer 'Charging stations' shows socket:type1_combo~^..*$&socket:type1_combo!=1 with a fixed text, namely '<b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:type1_combo~.+&socket:type1_combo!=1 with a fixed text, namely '<b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:tesla_supercharger",
@@ -170,7 +170,7 @@
     },
     {
       "key": "socket:tesla_supercharger",
-      "description": "Layer 'Charging stations' shows socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=1 with a fixed text, namely '<b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:tesla_supercharger~.+&socket:tesla_supercharger!=1 with a fixed text, namely '<b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:type2",
@@ -179,7 +179,7 @@
     },
     {
       "key": "socket:type2",
-      "description": "Layer 'Charging stations' shows socket:type2~^..*$&socket:type2!=1 with a fixed text, namely '<b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:type2~.+&socket:type2!=1 with a fixed text, namely '<b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:type2_combo",
@@ -188,7 +188,7 @@
     },
     {
       "key": "socket:type2_combo",
-      "description": "Layer 'Charging stations' shows socket:type2_combo~^..*$&socket:type2_combo!=1 with a fixed text, namely '<b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:type2_combo~.+&socket:type2_combo!=1 with a fixed text, namely '<b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:type2_cable",
@@ -197,7 +197,7 @@
     },
     {
       "key": "socket:type2_cable",
-      "description": "Layer 'Charging stations' shows socket:type2_cable~^..*$&socket:type2_cable!=1 with a fixed text, namely '<b>Type 2 with cable</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:type2_cable~.+&socket:type2_cable!=1 with a fixed text, namely '<b>Type 2 with cable</b> (mennekes)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:tesla_supercharger_ccs",
@@ -206,7 +206,7 @@
     },
     {
       "key": "socket:tesla_supercharger_ccs",
-      "description": "Layer 'Charging stations' shows socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=1 with a fixed text, namely '<b>Tesla Supercharger CCS</b> (a branded type2_css)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=1 with a fixed text, namely '<b>Tesla Supercharger CCS</b> (a branded type2_css)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:tesla_destination",
@@ -215,7 +215,7 @@
     },
     {
       "key": "socket:tesla_destination",
-      "description": "Layer 'Charging stations' shows socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country=us with a fixed text, namely '<b>Tesla Supercharger (destination)</b>' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:tesla_destination~.+&socket:tesla_destination!=1&_country=us with a fixed text, namely '<b>Tesla Supercharger (destination)</b>' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:tesla_destination",
@@ -224,7 +224,7 @@
     },
     {
       "key": "socket:tesla_destination",
-      "description": "Layer 'Charging stations' shows socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country!=us with a fixed text, namely '<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:tesla_destination~.+&socket:tesla_destination!=1&_country!=us with a fixed text, namely '<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:USB-A",
@@ -233,7 +233,7 @@
     },
     {
       "key": "socket:USB-A",
-      "description": "Layer 'Charging stations' shows socket:USB-A~^..*$&socket:USB-A!=1 with a fixed text, namely '<b>USB</b> to charge phones and small electronics' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:USB-A~.+&socket:USB-A!=1 with a fixed text, namely '<b>USB</b> to charge phones and small electronics' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:bosch_3pin",
@@ -242,7 +242,7 @@
     },
     {
       "key": "socket:bosch_3pin",
-      "description": "Layer 'Charging stations' shows socket:bosch_3pin~^..*$&socket:bosch_3pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 3 pins</b> and cable' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:bosch_3pin~.+&socket:bosch_3pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 3 pins</b> and cable' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:bosch_5pin",
@@ -251,7 +251,7 @@
     },
     {
       "key": "socket:bosch_5pin",
-      "description": "Layer 'Charging stations' shows socket:bosch_5pin~^..*$&socket:bosch_5pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 5 pins</b> and cable' (in the MapComplete.osm.be theme 'Charging stations')"
+      "description": "Layer 'Charging stations' shows socket:bosch_5pin~.+&socket:bosch_5pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 5 pins</b> and cable' (in the MapComplete.osm.be theme 'Charging stations')"
     },
     {
       "key": "socket:schuko",
diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json
index 4bcfdbf38..c6bd77b05 100644
--- a/Docs/TagInfo/mapcomplete_climbing.json
+++ b/Docs/TagInfo/mapcomplete_climbing.json
@@ -38,7 +38,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Climbing club' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing club' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "email",
@@ -46,7 +46,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.osm.be theme 'Open Climbing Map')"
+      "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.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "phone",
@@ -54,7 +54,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Climbing club' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing club' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "opening_hours",
@@ -125,7 +125,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Climbing gyms' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing gyms' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "phone",
@@ -133,7 +133,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Climbing gyms' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing gyms' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "email",
@@ -141,7 +141,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.osm.be theme 'Open Climbing Map')"
+      "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.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "charge",
@@ -195,7 +195,7 @@
     },
     {
       "key": "climbing:boulder",
-      "description": "Layer 'Climbing gyms' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing gyms' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "climbing:sport",
@@ -209,7 +209,7 @@
     },
     {
       "key": "climbing:sport",
-      "description": "Layer 'Climbing gyms' shows climbing:sport~^..*$ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing gyms' shows climbing:sport~.+ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "climbing:bolts:max",
@@ -227,7 +227,7 @@
     },
     {
       "key": "climbing:speed",
-      "description": "Layer 'Climbing gyms' shows climbing:speed~^..*$ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing gyms' shows climbing:speed~.+ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "access",
@@ -442,7 +442,7 @@
     },
     {
       "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Open Climbing Map')"
     },
     {
       "key": "access",
diff --git a/Docs/TagInfo/mapcomplete_cycle_infra.json b/Docs/TagInfo/mapcomplete_cycle_infra.json
index dd10b3713..6eaabf2d7 100644
--- a/Docs/TagInfo/mapcomplete_cycle_infra.json
+++ b/Docs/TagInfo/mapcomplete_cycle_infra.json
@@ -428,7 +428,7 @@
     },
     {
       "key": "cycleway:traffic_sign",
-      "description": "Layer 'Cycleways and roads' shows cycleway:traffic_sign~^BE:D7;.*$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Bicycle infrastructure')"
+      "description": "Layer 'Cycleways and roads' shows cycleway:traffic_sign~^(BE:D7;.*)$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Bicycle infrastructure')"
     },
     {
       "key": "cycleway:traffic_sign",
@@ -452,7 +452,7 @@
     },
     {
       "key": "traffic_sign",
-      "description": "Layer 'Cycleways and roads' shows traffic_sign~^BE:D7;.*$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Bicycle infrastructure')"
+      "description": "Layer 'Cycleways and roads' shows traffic_sign~^(BE:D7;.*)$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Bicycle infrastructure')"
     },
     {
       "key": "traffic_sign",
diff --git a/Docs/TagInfo/mapcomplete_cyclofix.json b/Docs/TagInfo/mapcomplete_cyclofix.json
index e2da62b0b..f87973a7f 100644
--- a/Docs/TagInfo/mapcomplete_cyclofix.json
+++ b/Docs/TagInfo/mapcomplete_cyclofix.json
@@ -196,7 +196,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bicycle rental' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bicycle rental' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "email",
@@ -204,7 +204,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.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "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.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "phone",
@@ -212,7 +212,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bicycle rental' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "opening_hours",
@@ -386,7 +386,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bike repair/shop' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bike repair/shop' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "phone",
@@ -394,7 +394,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bike repair/shop' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bike repair/shop' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "email",
@@ -402,7 +402,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.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "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.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "opening_hours",
@@ -638,7 +638,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bicycle library' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bicycle library' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "phone",
@@ -646,7 +646,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bicycle library' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "email",
@@ -654,7 +654,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.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "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.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "opening_hours",
@@ -1145,7 +1145,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bike-related object' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bike-related object' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "email",
@@ -1153,7 +1153,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.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "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.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "phone",
@@ -1161,7 +1161,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bike-related object' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Bike-related object' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "opening_hours",
@@ -1484,7 +1484,7 @@
     },
     {
       "key": "socket:schuko",
-      "description": "Layer 'Charging stations' shows socket:schuko~^..*$&socket:schuko!=1 with a fixed text, namely '<b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:schuko~.+&socket:schuko!=1 with a fixed text, namely '<b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:typee",
@@ -1493,7 +1493,7 @@
     },
     {
       "key": "socket:typee",
-      "description": "Layer 'Charging stations' shows socket:typee~^..*$&socket:typee!=1 with a fixed text, namely '<b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:typee~.+&socket:typee!=1 with a fixed text, namely '<b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:chademo",
@@ -1502,7 +1502,7 @@
     },
     {
       "key": "socket:chademo",
-      "description": "Layer 'Charging stations' shows socket:chademo~^..*$&socket:chademo!=1 with a fixed text, namely '<b>Chademo</b>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:chademo~.+&socket:chademo!=1 with a fixed text, namely '<b>Chademo</b>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:type1_cable",
@@ -1511,7 +1511,7 @@
     },
     {
       "key": "socket:type1_cable",
-      "description": "Layer 'Charging stations' shows socket:type1_cable~^..*$&socket:type1_cable!=1 with a fixed text, namely '<b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:type1_cable~.+&socket:type1_cable!=1 with a fixed text, namely '<b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:type1",
@@ -1520,7 +1520,7 @@
     },
     {
       "key": "socket:type1",
-      "description": "Layer 'Charging stations' shows socket:type1~^..*$&socket:type1!=1 with a fixed text, namely '<b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:type1~.+&socket:type1!=1 with a fixed text, namely '<b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:type1_combo",
@@ -1529,7 +1529,7 @@
     },
     {
       "key": "socket:type1_combo",
-      "description": "Layer 'Charging stations' shows socket:type1_combo~^..*$&socket:type1_combo!=1 with a fixed text, namely '<b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:type1_combo~.+&socket:type1_combo!=1 with a fixed text, namely '<b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:tesla_supercharger",
@@ -1538,7 +1538,7 @@
     },
     {
       "key": "socket:tesla_supercharger",
-      "description": "Layer 'Charging stations' shows socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=1 with a fixed text, namely '<b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:tesla_supercharger~.+&socket:tesla_supercharger!=1 with a fixed text, namely '<b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:type2",
@@ -1547,7 +1547,7 @@
     },
     {
       "key": "socket:type2",
-      "description": "Layer 'Charging stations' shows socket:type2~^..*$&socket:type2!=1 with a fixed text, namely '<b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:type2~.+&socket:type2!=1 with a fixed text, namely '<b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:type2_combo",
@@ -1556,7 +1556,7 @@
     },
     {
       "key": "socket:type2_combo",
-      "description": "Layer 'Charging stations' shows socket:type2_combo~^..*$&socket:type2_combo!=1 with a fixed text, namely '<b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:type2_combo~.+&socket:type2_combo!=1 with a fixed text, namely '<b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:type2_cable",
@@ -1565,7 +1565,7 @@
     },
     {
       "key": "socket:type2_cable",
-      "description": "Layer 'Charging stations' shows socket:type2_cable~^..*$&socket:type2_cable!=1 with a fixed text, namely '<b>Type 2 with cable</b> (mennekes)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:type2_cable~.+&socket:type2_cable!=1 with a fixed text, namely '<b>Type 2 with cable</b> (mennekes)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:tesla_supercharger_ccs",
@@ -1574,7 +1574,7 @@
     },
     {
       "key": "socket:tesla_supercharger_ccs",
-      "description": "Layer 'Charging stations' shows socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=1 with a fixed text, namely '<b>Tesla Supercharger CCS</b> (a branded type2_css)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=1 with a fixed text, namely '<b>Tesla Supercharger CCS</b> (a branded type2_css)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:tesla_destination",
@@ -1583,7 +1583,7 @@
     },
     {
       "key": "socket:tesla_destination",
-      "description": "Layer 'Charging stations' shows socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country=us with a fixed text, namely '<b>Tesla Supercharger (destination)</b>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:tesla_destination~.+&socket:tesla_destination!=1&_country=us with a fixed text, namely '<b>Tesla Supercharger (destination)</b>' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:tesla_destination",
@@ -1592,7 +1592,7 @@
     },
     {
       "key": "socket:tesla_destination",
-      "description": "Layer 'Charging stations' shows socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country!=us with a fixed text, namely '<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:tesla_destination~.+&socket:tesla_destination!=1&_country!=us with a fixed text, namely '<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:USB-A",
@@ -1601,7 +1601,7 @@
     },
     {
       "key": "socket:USB-A",
-      "description": "Layer 'Charging stations' shows socket:USB-A~^..*$&socket:USB-A!=1 with a fixed text, namely '<b>USB</b> to charge phones and small electronics' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:USB-A~.+&socket:USB-A!=1 with a fixed text, namely '<b>USB</b> to charge phones and small electronics' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:bosch_3pin",
@@ -1610,7 +1610,7 @@
     },
     {
       "key": "socket:bosch_3pin",
-      "description": "Layer 'Charging stations' shows socket:bosch_3pin~^..*$&socket:bosch_3pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 3 pins</b> and cable' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:bosch_3pin~.+&socket:bosch_3pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 3 pins</b> and cable' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:bosch_5pin",
@@ -1619,7 +1619,7 @@
     },
     {
       "key": "socket:bosch_5pin",
-      "description": "Layer 'Charging stations' shows socket:bosch_5pin~^..*$&socket:bosch_5pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 5 pins</b> and cable' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
+      "description": "Layer 'Charging stations' shows socket:bosch_5pin~.+&socket:bosch_5pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 5 pins</b> and cable' (in the MapComplete.osm.be theme 'Cyclofix - an open map for cyclists')"
     },
     {
       "key": "socket:schuko",
diff --git a/Docs/TagInfo/mapcomplete_education.json b/Docs/TagInfo/mapcomplete_education.json
index c7041f9f7..688bb7807 100644
--- a/Docs/TagInfo/mapcomplete_education.json
+++ b/Docs/TagInfo/mapcomplete_education.json
@@ -88,7 +88,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Colleges and universities' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Education')"
+      "description": "Layer 'Colleges and universities' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Education')"
     },
     {
       "key": "email",
@@ -96,7 +96,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.osm.be theme 'Education')"
+      "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.osm.be theme 'Education')"
     },
     {
       "key": "phone",
@@ -104,7 +104,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Colleges and universities' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Education')"
+      "description": "Layer 'Colleges and universities' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Education')"
     },
     {
       "key": "amenity",
@@ -229,7 +229,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Primary and secondary schools' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Education')"
+      "description": "Layer 'Primary and secondary schools' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Education')"
     },
     {
       "key": "phone",
@@ -237,7 +237,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Primary and secondary schools' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Education')"
+      "description": "Layer 'Primary and secondary schools' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Education')"
     },
     {
       "key": "email",
@@ -245,7 +245,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.osm.be theme 'Education')"
+      "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.osm.be theme 'Education')"
     },
     {
       "key": "school:language",
@@ -2707,7 +2707,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Kindergartens and childcare' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Education')"
+      "description": "Layer 'Kindergartens and childcare' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Education')"
     },
     {
       "key": "email",
@@ -2715,7 +2715,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.osm.be theme 'Education')"
+      "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.osm.be theme 'Education')"
     },
     {
       "key": "phone",
@@ -2723,7 +2723,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Kindergartens and childcare' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Education')"
+      "description": "Layer 'Kindergartens and childcare' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Education')"
     },
     {
       "key": "opening_hours",
diff --git a/Docs/TagInfo/mapcomplete_food.json b/Docs/TagInfo/mapcomplete_food.json
index 22ba75d73..010611a9f 100644
--- a/Docs/TagInfo/mapcomplete_food.json
+++ b/Docs/TagInfo/mapcomplete_food.json
@@ -89,7 +89,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Restaurants and fast food' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
+      "description": "Layer 'Restaurants and fast food' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
     },
     {
       "key": "email",
@@ -97,7 +97,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.osm.be 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'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
     },
     {
       "key": "phone",
@@ -105,7 +105,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Restaurants and fast food' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
+      "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Restaurants and fast food')"
     },
     {
       "key": "payment:cash",
diff --git a/Docs/TagInfo/mapcomplete_fritures.json b/Docs/TagInfo/mapcomplete_fritures.json
index 9cb973d52..78009f34c 100644
--- a/Docs/TagInfo/mapcomplete_fritures.json
+++ b/Docs/TagInfo/mapcomplete_fritures.json
@@ -93,7 +93,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Fries shop' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Fries shops')"
+      "description": "Layer 'Fries shop' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Fries shops')"
     },
     {
       "key": "email",
@@ -101,7 +101,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.osm.be theme 'Fries shops')"
+      "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.osm.be theme 'Fries shops')"
     },
     {
       "key": "phone",
@@ -109,7 +109,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Fries shop' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Fries shops')"
+      "description": "Layer 'Fries shop' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Fries shops')"
     },
     {
       "key": "payment:cash",
diff --git a/Docs/TagInfo/mapcomplete_hackerspaces.json b/Docs/TagInfo/mapcomplete_hackerspaces.json
index d64bf7b73..49f45709f 100644
--- a/Docs/TagInfo/mapcomplete_hackerspaces.json
+++ b/Docs/TagInfo/mapcomplete_hackerspaces.json
@@ -51,7 +51,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hackerspace' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
+      "description": "Layer 'Hackerspace' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
     },
     {
       "key": "email",
@@ -59,7 +59,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.osm.be theme 'Hackerspaces')"
+      "description": "Layer 'Hackerspace' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
     },
     {
       "key": "phone",
@@ -67,7 +67,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hackerspace' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
+      "description": "Layer 'Hackerspace' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Hackerspaces')"
     },
     {
       "key": "opening_hours",
diff --git a/Docs/TagInfo/mapcomplete_healthcare.json b/Docs/TagInfo/mapcomplete_healthcare.json
index 010bc5a3e..c37550acd 100644
--- a/Docs/TagInfo/mapcomplete_healthcare.json
+++ b/Docs/TagInfo/mapcomplete_healthcare.json
@@ -51,7 +51,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Doctors' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "email",
@@ -59,7 +59,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.osm.be theme 'Healthcare')"
+      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -67,7 +67,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Doctors' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "name",
@@ -112,7 +112,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hospitals' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "email",
@@ -120,7 +120,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.osm.be theme 'Healthcare')"
+      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -128,7 +128,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hospitals' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'Hospitals' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "amenity",
@@ -165,7 +165,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "email",
@@ -173,7 +173,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "website",
@@ -181,7 +181,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
+      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Healthcare')"
     },
     {
       "key": "wheelchair",
diff --git a/Docs/TagInfo/mapcomplete_hotels.json b/Docs/TagInfo/mapcomplete_hotels.json
index 1877fabe0..3259fd5fb 100644
--- a/Docs/TagInfo/mapcomplete_hotels.json
+++ b/Docs/TagInfo/mapcomplete_hotels.json
@@ -41,7 +41,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hotels' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Hotels')"
+      "description": "Layer 'Hotels' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Hotels')"
     },
     {
       "key": "email",
@@ -49,7 +49,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.osm.be theme 'Hotels')"
+      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Hotels')"
     },
     {
       "key": "website",
@@ -57,7 +57,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hotels' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Hotels')"
+      "description": "Layer 'Hotels' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Hotels')"
     },
     {
       "key": "wheelchair",
diff --git a/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json b/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json
index 9546b74e4..972c3ea46 100644
--- a/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json
+++ b/Docs/TagInfo/mapcomplete_kerbs_and_crossings.json
@@ -428,7 +428,7 @@
     },
     {
       "key": "cycleway:traffic_sign",
-      "description": "Layer 'Cycleways and roads' shows cycleway:traffic_sign~^BE:D7;.*$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Kerbs and crossings')"
+      "description": "Layer 'Cycleways and roads' shows cycleway:traffic_sign~^(BE:D7;.*)$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Kerbs and crossings')"
     },
     {
       "key": "cycleway:traffic_sign",
@@ -452,7 +452,7 @@
     },
     {
       "key": "traffic_sign",
-      "description": "Layer 'Cycleways and roads' shows traffic_sign~^BE:D7;.*$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Kerbs and crossings')"
+      "description": "Layer 'Cycleways and roads' shows traffic_sign~^(BE:D7;.*)$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Kerbs and crossings')"
     },
     {
       "key": "traffic_sign",
@@ -678,6 +678,22 @@
       "description": "The MapComplete theme Kerbs and crossings has a layer Kerbs showing features with this tag",
       "value": "kerb"
     },
+    {
+      "key": "image",
+      "description": "The layer 'Kerbs 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 'Kerbs 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 'Kerbs 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 'Kerbs 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": "kerb",
       "description": "Layer 'Kerbs' shows kerb=raised with a fixed text, namely 'This kerb is raised (>3 cm)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Kerbs and crossings')",
diff --git a/Docs/TagInfo/mapcomplete_nature.json b/Docs/TagInfo/mapcomplete_nature.json
index 1c829e846..33496ab4b 100644
--- a/Docs/TagInfo/mapcomplete_nature.json
+++ b/Docs/TagInfo/mapcomplete_nature.json
@@ -276,7 +276,7 @@
     },
     {
       "key": "operator",
-      "description": "Layer 'Nature reserve' shows operator~^(n|N)atuurpunt.*$ with a fixed text, namely 'Operated by {operator}' (in the MapComplete.osm.be theme 'Into nature')"
+      "description": "Layer 'Nature reserve' shows operator~^((n|N)atuurpunt.*)$ with a fixed text, namely 'Operated by {operator}' (in the MapComplete.osm.be theme 'Into nature')"
     },
     {
       "key": "operator",
@@ -318,7 +318,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Nature reserve' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Into nature')"
+      "description": "Layer 'Nature reserve' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Into nature')"
     },
     {
       "key": "curator",
@@ -346,7 +346,7 @@
     },
     {
       "key": "wikipedia",
-      "description": "Layer 'Nature reserve' shows wikipedia~^..*$ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Into nature')"
+      "description": "Layer 'Nature reserve' shows wikipedia~.+ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Into nature')"
     },
     {
       "key": "wikidata",
diff --git a/Docs/TagInfo/mapcomplete_observation_towers.json b/Docs/TagInfo/mapcomplete_observation_towers.json
index e49c63679..f8ac1f308 100644
--- a/Docs/TagInfo/mapcomplete_observation_towers.json
+++ b/Docs/TagInfo/mapcomplete_observation_towers.json
@@ -84,7 +84,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Observation towers' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Observation towers')"
+      "description": "Layer 'Observation towers' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Observation towers')"
     },
     {
       "key": "step_count",
@@ -130,7 +130,7 @@
     },
     {
       "key": "wikipedia",
-      "description": "Layer 'Observation towers' shows wikipedia~^..*$ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Observation towers')"
+      "description": "Layer 'Observation towers' shows wikipedia~.+ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Observation towers')"
     },
     {
       "key": "wikidata",
diff --git a/Docs/TagInfo/mapcomplete_onwheels.json b/Docs/TagInfo/mapcomplete_onwheels.json
index efae5e6d6..457d9200d 100644
--- a/Docs/TagInfo/mapcomplete_onwheels.json
+++ b/Docs/TagInfo/mapcomplete_onwheels.json
@@ -124,7 +124,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Cafés and pubs' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Cafés and pubs' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -132,7 +132,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.osm.be theme 'OnWheels')"
+      "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.osm.be theme 'OnWheels')"
     },
     {
       "key": "phone",
@@ -140,7 +140,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Cafés and pubs' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "payment:cash",
@@ -586,7 +586,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Restaurants and fast food' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Restaurants and fast food' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -594,7 +594,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.osm.be theme 'OnWheels')"
+      "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.osm.be theme 'OnWheels')"
     },
     {
       "key": "phone",
@@ -602,7 +602,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Restaurants and fast food' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "payment:cash",
@@ -947,6 +947,22 @@
       "description": "The MapComplete theme OnWheels has a layer Kerbs showing features with this tag",
       "value": "kerb"
     },
+    {
+      "key": "image",
+      "description": "The layer 'Kerbs 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 'Kerbs 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 'Kerbs 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 'Kerbs 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": "kerb",
       "description": "Layer 'Kerbs' shows kerb=raised with a fixed text, namely 'This kerb is raised (>3 cm)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'OnWheels')",
@@ -1952,7 +1968,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Shop' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Shop' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -1960,7 +1976,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.osm.be theme 'OnWheels')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "phone",
@@ -1968,7 +1984,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Shop' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "payment:cash",
@@ -2327,7 +2343,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -2335,7 +2351,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2343,7 +2359,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "wheelchair",
@@ -2401,7 +2417,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Doctors' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -2409,7 +2425,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.osm.be theme 'OnWheels')"
+      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2417,7 +2433,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Doctors' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "name",
@@ -2462,7 +2478,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hospitals' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -2470,7 +2486,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.osm.be theme 'OnWheels')"
+      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2478,7 +2494,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hospitals' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Hospitals' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "amenity",
@@ -2667,7 +2683,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hotels' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Hotels' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -2675,7 +2691,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.osm.be theme 'OnWheels')"
+      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2683,7 +2699,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hotels' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'Hotels' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "wheelchair",
@@ -2781,7 +2797,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'governments' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'governments' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "email",
@@ -2789,7 +2805,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.osm.be theme 'OnWheels')"
+      "description": "Layer 'governments' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "website",
@@ -2797,7 +2813,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'governments' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
+      "description": "Layer 'governments' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'OnWheels')"
     },
     {
       "key": "name",
diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json
index ff4a4c2aa..1cf69d9fb 100644
--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
@@ -156,6 +156,15 @@
       "description": "Layer 'Artworks' shows artwork_type=tilework with a fixed text, namely 'Tilework' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
       "value": "tilework"
     },
+    {
+      "key": "artwork_type",
+      "description": "Layer 'Artworks' shows artwork_type=woodcarving with a fixed text, namely 'Woodcarving' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Personal theme')",
+      "value": "woodcarving"
+    },
+    {
+      "key": "artist:wikidata",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'artist:wikidata' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "artist_name",
       "description": "Layer 'Artworks' shows and asks freeform values for key 'artist_name' (in the MapComplete.osm.be theme 'Personal theme')"
@@ -168,6 +177,19 @@
       "key": "wikidata",
       "description": "Layer 'Artworks' shows and asks freeform values for key 'wikidata' (in the MapComplete.osm.be theme 'Personal theme')"
     },
+    {
+      "key": "wikipedia",
+      "description": "Layer 'Artworks' shows wikipedia~.+ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
+    {
+      "key": "wikidata",
+      "description": "Layer 'Artworks' shows  with a fixed text, namely 'No Wikipedia page has been linked yet' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key wikidata.",
+      "value": ""
+    },
+    {
+      "key": "subject:wikidata",
+      "description": "Layer 'Artworks' shows and asks freeform values for key 'subject:wikidata' (in the MapComplete.osm.be theme 'Personal theme')"
+    },
     {
       "key": "barrier",
       "description": "The MapComplete theme Personal theme has a layer Barriers showing features with this tag",
@@ -477,7 +499,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bicycle library' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bicycle library' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -485,7 +507,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bicycle library' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bicycle library' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -493,7 +515,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -622,7 +644,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bicycle rental' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bicycle rental' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -630,7 +652,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -638,7 +660,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bicycle rental' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bicycle rental' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -1440,7 +1462,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bike repair/shop' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bike repair/shop' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -1448,7 +1470,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bike repair/shop' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bike repair/shop' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -1456,7 +1478,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -1732,7 +1754,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Bike-related object' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bike-related object' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -1740,7 +1762,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -1748,7 +1770,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Bike-related object' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Bike-related object' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -2017,7 +2039,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Cafés and pubs' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Cafés and pubs' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -2025,7 +2047,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -2033,7 +2055,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Cafés and pubs' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Cafés and pubs' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "payment:cash",
@@ -2275,7 +2297,7 @@
     },
     {
       "key": "socket:schuko",
-      "description": "Layer 'Charging stations' shows socket:schuko~^..*$&socket:schuko!=1 with a fixed text, namely '<b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:schuko~.+&socket:schuko!=1 with a fixed text, namely '<b>Schuko wall plug</b> without ground pin (CEE7/4 type F)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:typee",
@@ -2284,7 +2306,7 @@
     },
     {
       "key": "socket:typee",
-      "description": "Layer 'Charging stations' shows socket:typee~^..*$&socket:typee!=1 with a fixed text, namely '<b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:typee~.+&socket:typee!=1 with a fixed text, namely '<b>European wall plug</b> with ground pin (CEE7/4 type E)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:chademo",
@@ -2293,7 +2315,7 @@
     },
     {
       "key": "socket:chademo",
-      "description": "Layer 'Charging stations' shows socket:chademo~^..*$&socket:chademo!=1 with a fixed text, namely '<b>Chademo</b>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:chademo~.+&socket:chademo!=1 with a fixed text, namely '<b>Chademo</b>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:type1_cable",
@@ -2302,7 +2324,7 @@
     },
     {
       "key": "socket:type1_cable",
-      "description": "Layer 'Charging stations' shows socket:type1_cable~^..*$&socket:type1_cable!=1 with a fixed text, namely '<b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:type1_cable~.+&socket:type1_cable!=1 with a fixed text, namely '<b>Type 1 with cable</b> (J1772)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:type1",
@@ -2311,7 +2333,7 @@
     },
     {
       "key": "socket:type1",
-      "description": "Layer 'Charging stations' shows socket:type1~^..*$&socket:type1!=1 with a fixed text, namely '<b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:type1~.+&socket:type1!=1 with a fixed text, namely '<b>Type 1 <i>without</i> cable</b> (J1772)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:type1_combo",
@@ -2320,7 +2342,7 @@
     },
     {
       "key": "socket:type1_combo",
-      "description": "Layer 'Charging stations' shows socket:type1_combo~^..*$&socket:type1_combo!=1 with a fixed text, namely '<b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:type1_combo~.+&socket:type1_combo!=1 with a fixed text, namely '<b>Type 1 CCS</b> (aka Type 1 Combo)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:tesla_supercharger",
@@ -2329,7 +2351,7 @@
     },
     {
       "key": "socket:tesla_supercharger",
-      "description": "Layer 'Charging stations' shows socket:tesla_supercharger~^..*$&socket:tesla_supercharger!=1 with a fixed text, namely '<b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:tesla_supercharger~.+&socket:tesla_supercharger!=1 with a fixed text, namely '<b>Tesla Supercharger</b>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:type2",
@@ -2338,7 +2360,7 @@
     },
     {
       "key": "socket:type2",
-      "description": "Layer 'Charging stations' shows socket:type2~^..*$&socket:type2!=1 with a fixed text, namely '<b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:type2~.+&socket:type2!=1 with a fixed text, namely '<b>Type 2</b> (mennekes)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:type2_combo",
@@ -2347,7 +2369,7 @@
     },
     {
       "key": "socket:type2_combo",
-      "description": "Layer 'Charging stations' shows socket:type2_combo~^..*$&socket:type2_combo!=1 with a fixed text, namely '<b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:type2_combo~.+&socket:type2_combo!=1 with a fixed text, namely '<b>Type 2 CCS</b> (mennekes)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:type2_cable",
@@ -2356,7 +2378,7 @@
     },
     {
       "key": "socket:type2_cable",
-      "description": "Layer 'Charging stations' shows socket:type2_cable~^..*$&socket:type2_cable!=1 with a fixed text, namely '<b>Type 2 with cable</b> (mennekes)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:type2_cable~.+&socket:type2_cable!=1 with a fixed text, namely '<b>Type 2 with cable</b> (mennekes)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:tesla_supercharger_ccs",
@@ -2365,7 +2387,7 @@
     },
     {
       "key": "socket:tesla_supercharger_ccs",
-      "description": "Layer 'Charging stations' shows socket:tesla_supercharger_ccs~^..*$&socket:tesla_supercharger_ccs!=1 with a fixed text, namely '<b>Tesla Supercharger CCS</b> (a branded type2_css)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:tesla_supercharger_ccs~.+&socket:tesla_supercharger_ccs!=1 with a fixed text, namely '<b>Tesla Supercharger CCS</b> (a branded type2_css)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:tesla_destination",
@@ -2374,7 +2396,7 @@
     },
     {
       "key": "socket:tesla_destination",
-      "description": "Layer 'Charging stations' shows socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country=us with a fixed text, namely '<b>Tesla Supercharger (destination)</b>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:tesla_destination~.+&socket:tesla_destination!=1&_country=us with a fixed text, namely '<b>Tesla Supercharger (destination)</b>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:tesla_destination",
@@ -2383,7 +2405,7 @@
     },
     {
       "key": "socket:tesla_destination",
-      "description": "Layer 'Charging stations' shows socket:tesla_destination~^..*$&socket:tesla_destination!=1&_country!=us with a fixed text, namely '<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:tesla_destination~.+&socket:tesla_destination!=1&_country!=us with a fixed text, namely '<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:USB-A",
@@ -2392,7 +2414,7 @@
     },
     {
       "key": "socket:USB-A",
-      "description": "Layer 'Charging stations' shows socket:USB-A~^..*$&socket:USB-A!=1 with a fixed text, namely '<b>USB</b> to charge phones and small electronics' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:USB-A~.+&socket:USB-A!=1 with a fixed text, namely '<b>USB</b> to charge phones and small electronics' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:bosch_3pin",
@@ -2401,7 +2423,7 @@
     },
     {
       "key": "socket:bosch_3pin",
-      "description": "Layer 'Charging stations' shows socket:bosch_3pin~^..*$&socket:bosch_3pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 3 pins</b> and cable' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:bosch_3pin~.+&socket:bosch_3pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 3 pins</b> and cable' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:bosch_5pin",
@@ -2410,7 +2432,7 @@
     },
     {
       "key": "socket:bosch_5pin",
-      "description": "Layer 'Charging stations' shows socket:bosch_5pin~^..*$&socket:bosch_5pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 5 pins</b> and cable' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Charging stations' shows socket:bosch_5pin~.+&socket:bosch_5pin!=1 with a fixed text, namely '<b>Bosch Active Connect with 5 pins</b> and cable' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "socket:schuko",
@@ -3526,7 +3548,7 @@
     },
     {
       "key": "climbing:boulder",
-      "description": "Layer 'Climbing opportunities' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing opportunities' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "club",
@@ -3556,7 +3578,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Climbing club' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing club' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -3564,7 +3586,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -3572,7 +3594,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Climbing club' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing club' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -3614,7 +3636,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Climbing gyms' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing gyms' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -3622,7 +3644,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Climbing gyms' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing gyms' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -3630,7 +3652,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "charge",
@@ -3684,7 +3706,7 @@
     },
     {
       "key": "climbing:boulder",
-      "description": "Layer 'Climbing gyms' shows climbing:boulder~^..*$ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing gyms' shows climbing:boulder~.+ with a fixed text, namely 'There are {climbing:boulder} boulder routes' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "climbing:sport",
@@ -3698,7 +3720,7 @@
     },
     {
       "key": "climbing:sport",
-      "description": "Layer 'Climbing gyms' shows climbing:sport~^..*$ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing gyms' shows climbing:sport~.+ with a fixed text, namely 'There are {climbing:sport} sport climbing routes' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "climbing:bolts:max",
@@ -3716,7 +3738,7 @@
     },
     {
       "key": "climbing:speed",
-      "description": "Layer 'Climbing gyms' shows climbing:speed~^..*$ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Climbing gyms' shows climbing:speed~.+ with a fixed text, namely 'There are {climbing:speed} speed climbing walls' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "leisure",
@@ -4352,7 +4374,7 @@
     },
     {
       "key": "cycleway:traffic_sign",
-      "description": "Layer 'Cycleways and roads' shows cycleway:traffic_sign~^BE:D7;.*$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Cycleways and roads' shows cycleway:traffic_sign~^(BE:D7;.*)$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "cycleway:traffic_sign",
@@ -4376,7 +4398,7 @@
     },
     {
       "key": "traffic_sign",
-      "description": "Layer 'Cycleways and roads' shows traffic_sign~^BE:D7;.*$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Cycleways and roads' shows traffic_sign~^(BE:D7;.*)$ with a fixed text, namely 'Compulsory cycleway (with supplementary sign)<br>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "traffic_sign",
@@ -4564,7 +4586,7 @@
     },
     {
       "key": "defibrillator",
-      "description": "Layer 'Defibrillators' shows defibrillator~^..*$ with a fixed text, namely 'This is a special type of defibrillator: {defibrillator}' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Defibrillators' shows defibrillator~.+ with a fixed text, namely 'This is a special type of defibrillator: {defibrillator}' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "level",
@@ -4691,7 +4713,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Doctors' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Doctors' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -4699,7 +4721,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.osm.be theme 'Personal theme')"
+      "description": "Layer 'Doctors' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -4707,7 +4729,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Doctors' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Doctors' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "name",
@@ -5408,7 +5430,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Restaurants and fast food' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Restaurants and fast food' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -5416,7 +5438,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -5424,7 +5446,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Restaurants and fast food' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Restaurants and fast food' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "payment:cash",
@@ -5833,7 +5855,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'governments' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'governments' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -5841,7 +5863,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.osm.be theme 'Personal theme')"
+      "description": "Layer 'governments' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -5849,7 +5871,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'governments' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'governments' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "name",
@@ -5896,7 +5918,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hackerspace' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hackerspace' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -5904,7 +5926,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.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hackerspace' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -5912,7 +5934,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hackerspace' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hackerspace' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -6002,7 +6024,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hospitals' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hospitals' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -6010,7 +6032,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.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hospitals' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -6018,7 +6040,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hospitals' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hospitals' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "tourism",
@@ -6051,7 +6073,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Hotels' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hotels' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -6059,7 +6081,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.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hotels' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -6067,7 +6089,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Hotels' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Hotels' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "wheelchair",
@@ -6413,7 +6435,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Kindergartens and childcare' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Kindergartens and childcare' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -6421,7 +6443,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -6429,7 +6451,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Kindergartens and childcare' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Kindergartens and childcare' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -6689,7 +6711,7 @@
     },
     {
       "key": "operator",
-      "description": "Layer 'Nature reserve' shows operator~^(n|N)atuurpunt.*$ with a fixed text, namely 'Operated by {operator}' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Nature reserve' shows operator~^((n|N)atuurpunt.*)$ with a fixed text, namely 'Operated by {operator}' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "operator",
@@ -6731,7 +6753,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Nature reserve' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Nature reserve' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "curator",
@@ -6759,7 +6781,7 @@
     },
     {
       "key": "wikipedia",
-      "description": "Layer 'Nature reserve' shows wikipedia~^..*$ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Nature reserve' shows wikipedia~.+ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "wikidata",
@@ -6840,7 +6862,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Observation towers' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Observation towers' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "step_count",
@@ -6886,7 +6908,7 @@
     },
     {
       "key": "wikipedia",
-      "description": "Layer 'Observation towers' shows wikipedia~^..*$ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Observation towers' shows wikipedia~.+ with a fixed text, namely '{wikipedia():max-height:25rem}' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "wikidata",
@@ -7243,7 +7265,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -7251,7 +7273,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "website",
@@ -7259,7 +7281,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "wheelchair",
@@ -7468,7 +7490,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Playgrounds' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Playgrounds' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -7966,7 +7988,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Recycling' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Recycling' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -7974,7 +7996,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.osm.be theme 'Personal theme')"
+      "description": "Layer 'Recycling' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -7982,7 +8004,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Recycling' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Recycling' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
@@ -8116,7 +8138,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Primary and secondary schools' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Primary and secondary schools' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -8124,7 +8146,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Primary and secondary schools' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Primary and secondary schools' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -8132,7 +8154,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "school:language",
@@ -11441,7 +11463,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Shop' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Shop' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -11449,7 +11471,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.osm.be theme 'Personal theme')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -11457,7 +11479,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Shop' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "payment:cash",
@@ -11967,12 +11989,12 @@
     },
     {
       "key": "camera:direction",
-      "description": "Layer 'Surveillance camera's' shows direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key camera:direction.",
+      "description": "Layer 'Surveillance camera's' shows direction~.+ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Personal theme') Picking this answer will delete the key camera:direction.",
       "value": ""
     },
     {
       "key": "direction",
-      "description": "Layer 'Surveillance camera's' shows direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Surveillance camera's' shows direction~.+ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "operator",
@@ -12153,7 +12175,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Colleges and universities' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Colleges and universities' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "email",
@@ -12161,7 +12183,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.osm.be theme 'Personal theme')"
+      "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.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -12169,7 +12191,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Colleges and universities' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Colleges and universities' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "amenity",
@@ -12591,7 +12613,7 @@
     },
     {
       "key": "height",
-      "description": "Layer 'Tree' shows height~^^[0-9.]+$$ with a fixed text, namely 'Height: {height}&nbsp;m' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Tree' shows height~^(^[0-9.]+$)$ with a fixed text, namely 'Height: {height}&nbsp;m' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "species:wikidata",
@@ -12718,7 +12740,7 @@
     },
     {
       "key": "heritage",
-      "description": "Layer 'Tree' shows heritage~^..*$ with a fixed text, namely 'Registered as heritage by a different organisation' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'Tree' shows heritage~.+ with a fixed text, namely 'Registered as heritage by a different organisation' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "ref:OnroerendErfgoed",
@@ -12739,7 +12761,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'veterinary' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'veterinary' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "phone",
@@ -12747,7 +12769,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'veterinary' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
+      "description": "Layer 'veterinary' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Personal theme')"
     },
     {
       "key": "opening_hours",
diff --git a/Docs/TagInfo/mapcomplete_pets.json b/Docs/TagInfo/mapcomplete_pets.json
index 2c7dcde97..94cbd41ae 100644
--- a/Docs/TagInfo/mapcomplete_pets.json
+++ b/Docs/TagInfo/mapcomplete_pets.json
@@ -159,7 +159,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Dog friendly eateries' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'Dog friendly eateries' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "email",
@@ -167,7 +167,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.osm.be 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'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "phone",
@@ -175,7 +175,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Dog friendly eateries' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'Dog friendly eateries' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "payment:cash",
@@ -1368,7 +1368,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Dog-friendly shops' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'Dog-friendly shops' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "email",
@@ -1376,7 +1376,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.osm.be 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'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "phone",
@@ -1384,7 +1384,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Dog-friendly shops' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'Dog-friendly shops' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "payment:cash",
@@ -1510,7 +1510,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'veterinary' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'veterinary' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "phone",
@@ -1518,7 +1518,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'veterinary' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
+      "description": "Layer 'veterinary' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Veterinarians, dog parks and other pet-amenities')"
     },
     {
       "key": "opening_hours",
diff --git a/Docs/TagInfo/mapcomplete_playgrounds.json b/Docs/TagInfo/mapcomplete_playgrounds.json
index 7b70366c4..db0136de2 100644
--- a/Docs/TagInfo/mapcomplete_playgrounds.json
+++ b/Docs/TagInfo/mapcomplete_playgrounds.json
@@ -133,7 +133,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Playgrounds' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Playgrounds')"
+      "description": "Layer 'Playgrounds' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Playgrounds')"
     },
     {
       "key": "email",
diff --git a/Docs/TagInfo/mapcomplete_shops.json b/Docs/TagInfo/mapcomplete_shops.json
index 899bf8728..4f2f75f58 100644
--- a/Docs/TagInfo/mapcomplete_shops.json
+++ b/Docs/TagInfo/mapcomplete_shops.json
@@ -848,7 +848,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Shop' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Shop' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "email",
@@ -856,7 +856,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.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Shop' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "phone",
@@ -864,7 +864,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Shop' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'Shop' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "payment:cash",
@@ -1014,7 +1014,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'pharmacy' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'pharmacy' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "email",
@@ -1022,7 +1022,7 @@
     },
     {
       "key": "contact:email",
-      "description": "Layer 'pharmacy' shows contact:email~^..*$ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'pharmacy' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "website",
@@ -1030,7 +1030,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'pharmacy' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
+      "description": "Layer 'pharmacy' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Open Shop Map')"
     },
     {
       "key": "wheelchair",
diff --git a/Docs/TagInfo/mapcomplete_surveillance.json b/Docs/TagInfo/mapcomplete_surveillance.json
index 0e8261b77..2377e7ddd 100644
--- a/Docs/TagInfo/mapcomplete_surveillance.json
+++ b/Docs/TagInfo/mapcomplete_surveillance.json
@@ -67,12 +67,12 @@
     },
     {
       "key": "camera:direction",
-      "description": "Layer 'Surveillance camera's' shows direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance') Picking this answer will delete the key camera:direction.",
+      "description": "Layer 'Surveillance camera's' shows direction~.+ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance') Picking this answer will delete the key camera:direction.",
       "value": ""
     },
     {
       "key": "direction",
-      "description": "Layer 'Surveillance camera's' shows direction~^..*$ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance')"
+      "description": "Layer 'Surveillance camera's' shows direction~.+ with a fixed text, namely 'Films to a compass heading of {direction}' (in the MapComplete.osm.be theme 'Surveillance under Surveillance')"
     },
     {
       "key": "operator",
diff --git a/Docs/TagInfo/mapcomplete_trees.json b/Docs/TagInfo/mapcomplete_trees.json
index c81845b70..80384008a 100644
--- a/Docs/TagInfo/mapcomplete_trees.json
+++ b/Docs/TagInfo/mapcomplete_trees.json
@@ -33,7 +33,7 @@
     },
     {
       "key": "height",
-      "description": "Layer 'Tree' shows height~^^[0-9.]+$$ with a fixed text, namely 'Height: {height}&nbsp;m' (in the MapComplete.osm.be theme 'Trees')"
+      "description": "Layer 'Tree' shows height~^(^[0-9.]+$)$ with a fixed text, namely 'Height: {height}&nbsp;m' (in the MapComplete.osm.be theme 'Trees')"
     },
     {
       "key": "species:wikidata",
@@ -160,7 +160,7 @@
     },
     {
       "key": "heritage",
-      "description": "Layer 'Tree' shows heritage~^..*$ with a fixed text, namely 'Registered as heritage by a different organisation' (in the MapComplete.osm.be theme 'Trees')"
+      "description": "Layer 'Tree' shows heritage~.+ with a fixed text, namely 'Registered as heritage by a different organisation' (in the MapComplete.osm.be theme 'Trees')"
     },
     {
       "key": "ref:OnroerendErfgoed",
diff --git a/Docs/TagInfo/mapcomplete_waste.json b/Docs/TagInfo/mapcomplete_waste.json
index 01951f163..2e4ce2090 100644
--- a/Docs/TagInfo/mapcomplete_waste.json
+++ b/Docs/TagInfo/mapcomplete_waste.json
@@ -266,7 +266,7 @@
     },
     {
       "key": "contact:website",
-      "description": "Layer 'Recycling' shows contact:website~^..*$ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Waste')"
+      "description": "Layer 'Recycling' shows contact:website~.+ with a fixed text, namely '<a href='{contact:website}' target='_blank'>{contact:website}</a>' (in the MapComplete.osm.be theme 'Waste')"
     },
     {
       "key": "email",
@@ -274,7 +274,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.osm.be theme 'Waste')"
+      "description": "Layer 'Recycling' shows contact:email~.+ with a fixed text, namely '<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>' (in the MapComplete.osm.be theme 'Waste')"
     },
     {
       "key": "phone",
@@ -282,7 +282,7 @@
     },
     {
       "key": "contact:phone",
-      "description": "Layer 'Recycling' shows contact:phone~^..*$ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Waste')"
+      "description": "Layer 'Recycling' shows contact:phone~.+ with a fixed text, namely '<a href='tel:{contact:phone}'>{contact:phone}</a>' (in the MapComplete.osm.be theme 'Waste')"
     },
     {
       "key": "opening_hours",
diff --git a/UI/SpecialVisualizations.ts b/UI/SpecialVisualizations.ts
index 75a272c22..5504ce51e 100644
--- a/UI/SpecialVisualizations.ts
+++ b/UI/SpecialVisualizations.ts
@@ -1416,7 +1416,7 @@ export default class SpecialVisualizations {
                         null,
                         "  "
                     ) +
-                    "```",
+                    "\n```",
                 args: [
                     {
                         name: "key",