Merge branch 'develop' into feature/fitness-station

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.ts]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true

.git-blame-ignore-revs

@@ -0,0 +1,3 @@
+# to be filled once final sha is known
+# Prettier init
+b541d3eab49761faf710893386e9bee2801ff533

.github/actions/setup-and-validate/action.yml

@@ -4,9 +4,11 @@ runs:
   using: "composite"
   steps:
     - name: Set up Node.js
-      uses: actions/setup-node@v1.4.6
+      uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: "16"
+        cache: "npm"
+        cache-dependency-path: package-lock.json
 
     - name: install deps
       run: npm ci

.github/workflows/deploy_pietervdvn.yml

@@ -1,6 +1,5 @@
 name: Deployment on pietervdvn
-on:
+on: push
-  push
 
 jobs:
   build:
@@ -28,13 +27,15 @@ jobs:
           cd pietervdvn.github.io
           git pull
 
+      - name: get branch name
+        run: echo TARGET_BRANCH=${GITHUB_REF:11} >> $GITHUB_ENV
+
       - name: "Copying files"
         run: |
           echo "Deploying"
-          TARGET=${GITHUB_REF:11}
+          rm -rf pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/*
-          rm -rf pietervdvn.github.io/mc/$TARGET/*
+          mkdir -p pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/
-          mkdir -p pietervdvn.github.io/mc/$TARGET/
+          cp -r dist/* pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }}/
-          cp -r dist/* pietervdvn.github.io/mc/$TARGET/
           cd pietervdvn.github.io/
           git add *
           if git status | grep -q "Changes to be committed"
@@ -44,3 +45,13 @@ jobs:
           else
             echo "No changes to commit"
           fi
+        env:
+          TARGET_BRANCH: ${{ env.TARGET_BRANCH }}
+
+      - uses: mshick/add-pr-comment@v1
+        name: Comment the PR with the review URL
+        if: ${{ success() && github.ref != 'refs/heads/develop' && github.ref != 'refs/heads/master' }}
+        with:
+          message: |
+            [🚀 Preview Branch](https://pietervdvn.github.io/mc/${{ env.TARGET_BRANCH }})
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/validate-pr.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup and validate themes
         uses: ./.github/actions/setup-and-validate

.prettierignore

@@ -0,0 +1,13 @@
+node_modules
+.git
+langs/
+vendor/
+dist/
+.cache
+assets/generated/
+assets/themes/
+assets/layers/
+Docs/Tools/stats/
+Docs/Layers/
+Docs/Schemas/
+Docs/TagInfo/

.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "semi": false,
+  "printWidth": 100
+}

CODE_OF_CONDUCT.md

@@ -0,0 +1,18 @@
+MapComplete is currently a small project with little contributors where we try to make it pleasant for everyone.
+
+As such, if you interact with anyone, please be polite. Some hints on general interactions:
+
+- Everyone makes mistakes. Be forgiving if someone makes one - either technical or social.
+- People might have little time, might be tired, might be stressed about events in their life, ... Furhtermore, not everyone has the same communication skills (due to a different native language, different culture or different neurological forms) 
+  As a result, communications might be written in a way that might sound angry or unfriendly.
+  If you experience such feelings, make sure to read your post again for tone (or postpone writing till a later time).
+  If you read a message which sounds harsh, take a step back. The hard words might be unintentional, written during such a time. Be forgiving.
+- Try to be complete in your communication. Try to imagine what the person on the other side might not know yet and include this information.
+- Disagreements often come from different assumptions and/or perspective. In a disagreement, try to state what reasoning leads to the result.
+
+## Behaviour that will not be tolerated
+
+- Any hate speech. Racist, sexist, homophobic, transphobic, xenophobic... or similar will not be tolerated
+- Spam, trolling, flame wars, ...
+
+Such behaviours might result in bans.

CONTRIBUTING.md

@@ -8,9 +8,10 @@ There are multiple ways to contribute:
 - Translating MapComplete to your own language can be done
   on [this website](https://hosted.weblate.org/projects/mapcomplete/)
 - If you encounter a bug, the [issue tracker](https://github.com/pietervdvn/MapComplete/issues) is the place to be
-- If you want to improve a theme, create a new theme, spot a typo in the repo... the best way is to open a pull request. Read more about [making your own theme](/Docs/Making_Your_Own_Theme.md).
+- A good start to contribute is to create a single map layer showing features which interest you. Read more about [making your own theme](/Docs/Making_Your_Own_Theme.md).
+- If you want to improve a theme, create a new theme, spot a typo in the repo... the best way is to open a pull request. 
 
-People who stick around and contribute in a meaningful way, _might_ be granted write access to the repository. This is
+People who stick around and contribute in a meaningful way, _might_ be granted write access to the repository (except . This is
 done on a purely subjective basis, e.g. after a few pull requests and if you are a member of the OSM community.
 
 Rights of contributors

Customizations/AllKnownLayouts.ts

@@ -1,26 +1,28 @@
 import * as known_themes from "../assets/generated/known_layers_and_themes.json"
-import LayoutConfig from "../Models/ThemeConfig/LayoutConfig";
+import LayoutConfig from "../Models/ThemeConfig/LayoutConfig"
-import LayerConfig from "../Models/ThemeConfig/LayerConfig";
+import LayerConfig from "../Models/ThemeConfig/LayerConfig"
-import BaseUIElement from "../UI/BaseUIElement";
+import BaseUIElement from "../UI/BaseUIElement"
-import Combine from "../UI/Base/Combine";
+import Combine from "../UI/Base/Combine"
-import Title from "../UI/Base/Title";
+import Title from "../UI/Base/Title"
-import List from "../UI/Base/List";
+import List from "../UI/Base/List"
-import DependencyCalculator from "../Models/ThemeConfig/DependencyCalculator";
+import DependencyCalculator from "../Models/ThemeConfig/DependencyCalculator"
-import Constants from "../Models/Constants";
+import Constants from "../Models/Constants"
-import {Utils} from "../Utils";
+import { Utils } from "../Utils"
-import Link from "../UI/Base/Link";
+import Link from "../UI/Base/Link"
-import {LayoutConfigJson} from "../Models/ThemeConfig/Json/LayoutConfigJson";
+import { LayoutConfigJson } from "../Models/ThemeConfig/Json/LayoutConfigJson"
-import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
+import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson"
 
 export class AllKnownLayouts {
-    public static allKnownLayouts: Map<string, LayoutConfig> = AllKnownLayouts.AllLayouts();
+    public static allKnownLayouts: Map<string, LayoutConfig> = AllKnownLayouts.AllLayouts()
-    public static layoutsList: LayoutConfig[] = AllKnownLayouts.GenerateOrderedList(AllKnownLayouts.allKnownLayouts);
+    public static layoutsList: LayoutConfig[] = AllKnownLayouts.GenerateOrderedList(
+        AllKnownLayouts.allKnownLayouts
+    )
     // Must be below the list...
-    private static sharedLayers: Map<string, LayerConfig> = AllKnownLayouts.getSharedLayers();
+    private static sharedLayers: Map<string, LayerConfig> = AllKnownLayouts.getSharedLayers()
 
     public static AllPublicLayers(options?: {
-        includeInlineLayers:true | boolean
+        includeInlineLayers: true | boolean
-    }) : LayerConfig[] {
+    }): LayerConfig[] {
         const allLayers: LayerConfig[] = []
         const seendIds = new Set<string>()
         AllKnownLayouts.sharedLayers.forEach((layer, key) => {
@@ -28,7 +30,7 @@ export class AllKnownLayouts {
             allLayers.push(layer)
         })
         if (options?.includeInlineLayers ?? true) {
-            const publicLayouts = AllKnownLayouts.layoutsList.filter(l => !l.hideFromOverview)
+            const publicLayouts = AllKnownLayouts.layoutsList.filter((l) => !l.hideFromOverview)
             for (const layout of publicLayouts) {
                 if (layout.hideFromOverview) {
                     continue
@@ -40,7 +42,6 @@ export class AllKnownLayouts {
                     seendIds.add(layer.id)
                     allLayers.push(layer)
                 }
-
             }
         }
 
@@ -52,11 +53,14 @@ export class AllKnownLayouts {
      */
     public static themesUsingLayer(id: string, publicOnly = true): LayoutConfig[] {
         const themes = AllKnownLayouts.layoutsList
-            .filter(l => !(publicOnly && l.hideFromOverview) && l.id !== "personal")
+            .filter((l) => !(publicOnly && l.hideFromOverview) && l.id !== "personal")
-            .map(theme => ({theme, minzoom: theme.layers.find(layer => layer.id === id)?.minzoom}))
+            .map((theme) => ({
-            .filter(obj => obj.minzoom !== undefined)
+                theme,
+                minzoom: theme.layers.find((layer) => layer.id === id)?.minzoom,
+            }))
+            .filter((obj) => obj.minzoom !== undefined)
         themes.sort((th0, th1) => th1.minzoom - th0.minzoom)
-        return themes.map(th => th.theme);
+        return themes.map((th) => th.theme)
     }
 
     /**
@@ -65,12 +69,15 @@ export class AllKnownLayouts {
      * @param callback
      * @constructor
      */
-    public static GenOverviewsForSingleLayer(callback: (layer: LayerConfig, element: BaseUIElement, inlineSource: string) => void): void {
+    public static GenOverviewsForSingleLayer(
-        const allLayers: LayerConfig[] = Array.from(AllKnownLayouts.sharedLayers.values())
+        callback: (layer: LayerConfig, element: BaseUIElement, inlineSource: string) => void
-            .filter(layer => Constants.priviliged_layers.indexOf(layer.id) < 0)
+    ): void {
+        const allLayers: LayerConfig[] = Array.from(AllKnownLayouts.sharedLayers.values()).filter(
+            (layer) => Constants.priviliged_layers.indexOf(layer.id) < 0
+        )
         const builtinLayerIds: Set<string> = new Set<string>()
-        allLayers.forEach(l => builtinLayerIds.add(l.id))
+        allLayers.forEach((l) => builtinLayerIds.add(l.id))
-        const inlineLayers = new Map<string, string>();
+        const inlineLayers = new Map<string, string>()
 
         for (const layout of Array.from(AllKnownLayouts.allKnownLayouts.values())) {
             if (layout.hideFromOverview) {
@@ -78,7 +85,6 @@ export class AllKnownLayouts {
             }
 
             for (const layer of layout.layers) {
-
                 if (Constants.priviliged_layers.indexOf(layer.id) >= 0) {
                     continue
                 }
@@ -113,7 +119,6 @@ export class AllKnownLayouts {
             }
         }
 
-
         // Determine the cross-dependencies
         const layerIsNeededBy: Map<string, string[]> = new Map<string, string[]>()
 
@@ -125,12 +130,14 @@ export class AllKnownLayouts {
                 }
                 layerIsNeededBy.get(dependency).push(layer.id)
             }
-
-
         }
 
         allLayers.forEach((layer) => {
-            const element = layer.GenerateDocumentation(themesPerLayer.get(layer.id), layerIsNeededBy, DependencyCalculator.getLayerDependencies(layer))
+            const element = layer.GenerateDocumentation(
+                themesPerLayer.get(layer.id),
+                layerIsNeededBy,
+                DependencyCalculator.getLayerDependencies(layer)
+            )
             callback(layer, element, inlineLayers.get(layer.id))
         })
     }
@@ -146,11 +153,12 @@ export class AllKnownLayouts {
             }
         }
 
-        const allLayers: LayerConfig[] = Array.from(AllKnownLayouts.sharedLayers.values())
+        const allLayers: LayerConfig[] = Array.from(AllKnownLayouts.sharedLayers.values()).filter(
-            .filter(layer => Constants.priviliged_layers.indexOf(layer.id) < 0)
+            (layer) => Constants.priviliged_layers.indexOf(layer.id) < 0
+        )
 
         const builtinLayerIds: Set<string> = new Set<string>()
-        allLayers.forEach(l => builtinLayerIds.add(l.id))
+        allLayers.forEach((l) => builtinLayerIds.add(l.id))
 
         const themesPerLayer = new Map<string, string[]>()
 
@@ -166,7 +174,6 @@ export class AllKnownLayouts {
             }
         }
 
-
         // Determine the cross-dependencies
         const layerIsNeededBy: Map<string, string[]> = new Map<string, string[]>()
 
@@ -178,25 +185,32 @@ export class AllKnownLayouts {
                 }
                 layerIsNeededBy.get(dependency).push(layer.id)
             }
-
-
         }
 
-
         return new Combine([
             new Title("Special and other useful layers", 1),
             "MapComplete has a few data layers available in the theme which have special properties through builtin-hooks. Furthermore, there are some normal layers (which are built from normal Theme-config files) but are so general that they get a mention here.",
             new Title("Priviliged layers", 1),
-            new List(Constants.priviliged_layers.map(id => "[" + id + "](#" + id + ")")),
+            new List(Constants.priviliged_layers.map((id) => "[" + id + "](#" + id + ")")),
             ...Constants.priviliged_layers
-                .map(id => AllKnownLayouts.sharedLayers.get(id))
+                .map((id) => AllKnownLayouts.sharedLayers.get(id))
-                .map((l) => l.GenerateDocumentation(themesPerLayer.get(l.id), layerIsNeededBy, DependencyCalculator.getLayerDependencies(l), Constants.added_by_default.indexOf(l.id) >= 0, Constants.no_include.indexOf(l.id) < 0)),
+                .map((l) =>
+                    l.GenerateDocumentation(
+                        themesPerLayer.get(l.id),
+                        layerIsNeededBy,
+                        DependencyCalculator.getLayerDependencies(l),
+                        Constants.added_by_default.indexOf(l.id) >= 0,
+                        Constants.no_include.indexOf(l.id) < 0
+                    )
+                ),
             new Title("Normal layers", 1),
             "The following layers are included in MapComplete:",
-            new List(Array.from(AllKnownLayouts.sharedLayers.keys()).map(id => new Link(id, "./Layers/" + id + ".md")))
+            new List(
+                Array.from(AllKnownLayouts.sharedLayers.keys()).map(
+                    (id) => new Link(id, "./Layers/" + id + ".md")
+                )
+            ),
         ])
-
-
     }
 
     public static GenerateDocumentationForTheme(theme: LayoutConfig): BaseUIElement {
@@ -204,37 +218,42 @@ export class AllKnownLayouts {
             new Title(new Combine([theme.title, "(", theme.id + ")"]), 2),
             theme.description,
             "This theme contains the following layers:",
-            new List(theme.layers.map(l => l.id)),
+            new List(theme.layers.map((l) => l.id)),
             "Available languages:",
-            new List(theme.language)
+            new List(theme.language),
         ])
     }
 
     public static getSharedLayers(): Map<string, LayerConfig> {
-        const sharedLayers = new Map<string, LayerConfig>();
+        const sharedLayers = new Map<string, LayerConfig>()
         for (const layer of known_themes["layers"]) {
             try {
                 // @ts-ignore
                 const parsed = new LayerConfig(layer, "shared_layers")
-                sharedLayers.set(layer.id, parsed);
+                sharedLayers.set(layer.id, parsed)
             } catch (e) {
                 if (!Utils.runningFromConsole) {
-                    console.error("CRITICAL: Could not parse a layer configuration!", layer.id, " due to", e)
+                    console.error(
+                        "CRITICAL: Could not parse a layer configuration!",
+                        layer.id,
+                        " due to",
+                        e
+                    )
                 }
             }
         }
 
-        return sharedLayers;
+        return sharedLayers
     }
 
     public static getSharedLayersConfigs(): Map<string, LayerConfigJson> {
-        const sharedLayers = new Map<string, LayerConfigJson>();
+        const sharedLayers = new Map<string, LayerConfigJson>()
         for (const layer of known_themes["layers"]) {
             // @ts-ignore
-                sharedLayers.set(layer.id, layer);
+            sharedLayers.set(layer.id, layer)
         }
 
-        return sharedLayers;
+        return sharedLayers
     }
 
     private static GenerateOrderedList(allKnownLayouts: Map<string, LayoutConfig>): LayoutConfig[] {
@@ -242,28 +261,26 @@ export class AllKnownLayouts {
         allKnownLayouts.forEach((layout) => {
             list.push(layout)
         })
-        return list;
+        return list
     }
 
     private static AllLayouts(): Map<string, LayoutConfig> {
-        const dict: Map<string, LayoutConfig> = new Map();
+        const dict: Map<string, LayoutConfig> = new Map()
         for (const layoutConfigJson of known_themes["themes"]) {
             const layout = new LayoutConfig(<LayoutConfigJson>layoutConfigJson, true)
             dict.set(layout.id, layout)
             for (let i = 0; i < layout.layers.length; i++) {
-                let layer = layout.layers[i];
+                let layer = layout.layers[i]
-                if (typeof (layer) === "string") {
+                if (typeof layer === "string") {
-                    layer = AllKnownLayouts.sharedLayers.get(layer);
+                    layer = AllKnownLayouts.sharedLayers.get(layer)
                     layout.layers[i] = layer
                     if (layer === undefined) {
                         console.log("Defined layers are ", AllKnownLayouts.sharedLayers.keys())
                         throw `Layer ${layer} was not found or defined - probably a type was made`
                     }
                 }
-
             }
         }
-        return dict;
+        return dict
     }
-
 }

Customizations/SharedTagRenderings.ts

@@ -1,38 +1,49 @@
-import * as questions from "../assets/tagRenderings/questions.json";
+import * as questions from "../assets/tagRenderings/questions.json"
-import * as icons from "../assets/tagRenderings/icons.json";
+import * as icons from "../assets/tagRenderings/icons.json"
-import {Utils} from "../Utils";
+import { Utils } from "../Utils"
-import TagRenderingConfig from "../Models/ThemeConfig/TagRenderingConfig";
+import TagRenderingConfig from "../Models/ThemeConfig/TagRenderingConfig"
-import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson";
+import { TagRenderingConfigJson } from "../Models/ThemeConfig/Json/TagRenderingConfigJson"
-import BaseUIElement from "../UI/BaseUIElement";
+import BaseUIElement from "../UI/BaseUIElement"
-import Combine from "../UI/Base/Combine";
+import Combine from "../UI/Base/Combine"
-import Title from "../UI/Base/Title";
+import Title from "../UI/Base/Title"
-import {FixedUiElement} from "../UI/Base/FixedUiElement";
+import { FixedUiElement } from "../UI/Base/FixedUiElement"
-import List from "../UI/Base/List";
+import List from "../UI/Base/List"
 
 export default class SharedTagRenderings {
-
+    public static SharedTagRendering: Map<string, TagRenderingConfig> =
-    public static SharedTagRendering: Map<string, TagRenderingConfig> = SharedTagRenderings.generatedSharedFields();
+        SharedTagRenderings.generatedSharedFields()
-    public static SharedTagRenderingJson: Map<string, TagRenderingConfigJson> = SharedTagRenderings.generatedSharedFieldsJsons();
+    public static SharedTagRenderingJson: Map<string, TagRenderingConfigJson> =
-    public static SharedIcons: Map<string, TagRenderingConfig> = SharedTagRenderings.generatedSharedFields(true);
+        SharedTagRenderings.generatedSharedFieldsJsons()
+    public static SharedIcons: Map<string, TagRenderingConfig> =
+        SharedTagRenderings.generatedSharedFields(true)
 
     private static generatedSharedFields(iconsOnly = false): Map<string, TagRenderingConfig> {
         const configJsons = SharedTagRenderings.generatedSharedFieldsJsons(iconsOnly)
         const d = new Map<string, TagRenderingConfig>()
         for (const key of Array.from(configJsons.keys())) {
             try {
-                d.set(key, new TagRenderingConfig(configJsons.get(key), `SharedTagRenderings.${key}`))
+                d.set(
+                    key,
+                    new TagRenderingConfig(configJsons.get(key), `SharedTagRenderings.${key}`)
+                )
             } catch (e) {
                 if (!Utils.runningFromConsole) {
-                    console.error("BUG: could not parse", key, " from questions.json or icons.json - this error happened during the build step of the SharedTagRenderings", e)
+                    console.error(
-
+                        "BUG: could not parse",
+                        key,
+                        " from questions.json or icons.json - this error happened during the build step of the SharedTagRenderings",
+                        e
+                    )
                 }
             }
         }
         return d
     }
 
-    private static generatedSharedFieldsJsons(iconsOnly = false): Map<string, TagRenderingConfigJson> {
+    private static generatedSharedFieldsJsons(
-        const dict = new Map<string, TagRenderingConfigJson>();
+        iconsOnly = false
+    ): Map<string, TagRenderingConfigJson> {
+        const dict = new Map<string, TagRenderingConfigJson>()
 
         if (!iconsOnly) {
             for (const key in questions) {
@@ -53,13 +64,16 @@ export default class SharedTagRenderings {
             if (key === "id") {
                 return
             }
-            value.id = value.id ?? key;
+            value.id = value.id ?? key
-            if(value["builtin"] !== undefined){
+            if (value["builtin"] !== undefined) {
-                if(value["override"] == undefined){
+                if (value["override"] == undefined) {
-                    throw "HUH? Why whould you want to reuse a builtin if one doesn't override? In questions.json/"+key
+                    throw (
+                        "HUH? Why whould you want to reuse a builtin if one doesn't override? In questions.json/" +
+                        key
+                    )
                 }
-                if(typeof value["builtin"] !== "string"){
+                if (typeof value["builtin"] !== "string") {
-                    return;
+                    return
                 }
                 // This is a really funny situation: we extend another tagRendering!
                 const parent = Utils.Clone(dict.get(value["builtin"]))
@@ -73,36 +87,31 @@ export default class SharedTagRenderings {
             }
         })
 
-        
+        return dict
-        return dict;
     }
 
-
     public static HelpText(): BaseUIElement {
         return new Combine([
             new Combine([
+                new Title("Builtin questions", 1),
 
-                new Title("Builtin questions",1),
+                "The following items can be easily reused in your layers",
-
-                "The following items can be easily reused in your layers"
             ]).SetClass("flex flex-col"),
 
-            ... Array.from( SharedTagRenderings.SharedTagRendering.keys()).map(key => {
+            ...Array.from(SharedTagRenderings.SharedTagRendering.keys()).map((key) => {
                 const tr = SharedTagRenderings.SharedTagRendering.get(key)
                 let mappings: BaseUIElement = undefined
-                if(tr.mappings?.length > 0){
+                if (tr.mappings?.length > 0) {
-                    mappings = new List(tr.mappings.map(m => m.then.textFor("en")))
+                    mappings = new List(tr.mappings.map((m) => m.then.textFor("en")))
                 }
                 return new Combine([
                     new Title(key),
                     tr.render?.textFor("en"),
-                    tr.question?.textFor("en") ?? new FixedUiElement("Read-only tagrendering").SetClass("font-bold"),
+                    tr.question?.textFor("en") ??
-                    mappings
+                        new FixedUiElement("Read-only tagrendering").SetClass("font-bold"),
+                    mappings,
                 ]).SetClass("flex flex-col")
-
+            }),
-            })
-
         ]).SetClass("flex flex-col")
     }
-
 }

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)
@@ -69,6 +69,7 @@
 
   - ambulancestation
   - artwork
+  - barrier
   - bench
   - bench_at_pt
   - bicycle_library
@@ -104,6 +105,7 @@
   - hydrant
   - indoors
   - information_board
+  - kerbs
   - map
   - nature_reserve
   - observation_tower
@@ -137,6 +139,19 @@
 
 
 
+### wikipedia 
+
+
+
+
+
+  - artwork
+  - nature_reserve
+  - observation_tower
+
+
+
+
 ### website 
 
 
@@ -621,18 +636,6 @@
 
 
 
-### wikipedia 
-
-
-
-
-
-  - nature_reserve
-  - observation_tower
-
-
-
-
 ### wikidata.school-language 
 
 

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)

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 
 
 

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)

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)

Docs/Layers/barrier.md

@@ -74,6 +74,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
+
+
+
+
+
 ### bicycle=yes/no 
 
 

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
 
 

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` 
 

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`
 

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)
 
 
 

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)
 
 
 

Docs/Layers/bike_cleaning.md

@@ -92,10 +92,8 @@ This is rendered with  Using the cleaning service costs {service:bicycle:cleanin
 
 
 
-  - The cleaning service is free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dno&service:bicycle:cleaning:charge=' target='_blank'>no&service:bicycle:cleaning:charge=</a>`
+  - The cleaning service is free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dno' target='_blank'>no</a>`
-  - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dno' target='_blank'>no</a>`
+  - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dyes' target='_blank'>yes</a>`
-  - This option cannot be chosen as answer
-  - The cleaning service has a fee, but the amount is not known  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dyes&service:bicycle:cleaning:charge=' target='_blank'>yes&service:bicycle:cleaning:charge=</a>`
   - This option cannot be chosen as answer
 
 
@@ -115,10 +113,8 @@ This is rendered with  Using the cleaning service costs {charge}
 
 
 
-  - Free to use cleaning service  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno&charge=' target='_blank'>no&charge=</a>`
+  - Free to use cleaning service  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno' target='_blank'>no</a>`
-  - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dno' target='_blank'>no</a>`
+  - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes' target='_blank'>yes</a>`
-  - This option cannot be chosen as answer
-  - The cleaning service has a fee  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:fee' target='_blank'>fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:fee%3Dyes' target='_blank'>yes</a>`
 
 
 Only visible if  `amenity=bike_wash|amenity=bicycle_wash`  is shown 

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)

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
 
 
 

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`
 
@@ -505,10 +505,8 @@ This is rendered with  Using the cleaning service costs {service:bicycle:cleanin
 
 
 
-  - The cleaning service is free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dno&service:bicycle:cleaning:charge=' target='_blank'>no&service:bicycle:cleaning:charge=</a>`
+  - The cleaning service is free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dno' target='_blank'>no</a>`
-  - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dno' target='_blank'>no</a>`
+  - Free to use  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dyes' target='_blank'>yes</a>`
-  - This option cannot be chosen as answer
-  - The cleaning service has a fee, but the amount is not known  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:service:bicycle:cleaning:fee' target='_blank'>service:bicycle:cleaning:fee</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:service:bicycle:cleaning:fee%3Dyes&service:bicycle:cleaning:charge=' target='_blank'>yes&service:bicycle:cleaning:charge=</a>`
   - This option cannot be chosen as answer
 
 

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
 
 

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
 
 
 

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)
 
 
 
@@ -243,7 +243,7 @@ The question is  Does this place offer spots for long term rental?
 
   - There are some spots for long term rental, but you can also stay on a daily basis  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:permanent_camping' target='_blank'>permanent_camping</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Dyes' target='_blank'>yes</a>`
   - There are no permanent guests here  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:permanent_camping' target='_blank'>permanent_camping</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Dno' target='_blank'>no</a>`
-  - It is only possible to stay here if you have a long term contract(this place will disappear from this map if you choose this)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:permanent_camping' target='_blank'>permanent_camping</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Donly' target='_blank'>only</a>`
+  - It is only possible to stay here if you have a long term contract (this place disappears from this map if you choose this)  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:permanent_camping' target='_blank'>permanent_camping</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:permanent_camping%3Donly' target='_blank'>only</a>`
 
 
 

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
 
 
 

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
 
 
 

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
 
 

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$
+  - climbing!~^(route)$
-  - leisure!~^sports_centre$
+  - 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
  
 

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
 
 

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
  
 

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
  
 

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)

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)

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)

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
 
 
 

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
 
 

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
 
 

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
 
 
 

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
 
 
 

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)

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)
 
 
 

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)

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)

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)

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)

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
 
 
 

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
 
 
 

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
 
 

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
 
 

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)

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
  
 

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
 
 
 

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)

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 
 
 

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
 
 

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
 
 

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)

Docs/Layers/maproulette.md

@@ -29,10 +29,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - id~^..*$
+  - title~.+
 
 
-[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)
+[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)

Docs/Layers/maproulette_challenge.md

@@ -42,10 +42,10 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - id~^..*$
+  - mr_taskId~.+
 
 
-[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)
+[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)

Docs/Layers/named_streets.md

@@ -34,8 +34,8 @@ Elements must have the all of following tags to be shown on this layer:
 
 
 
-  - highway~^..*$
+  - highway~.+
-  - name~^..*$
+  - 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)

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

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

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)

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
 
 
 

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)

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
 
 

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>`
 

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
 
 

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
 
 
 

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
 
 

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
 
 

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
 
 
 

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
 
 
 

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)

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~^..*$
+  - name~.+
-  - highway~^..*$
+  - 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)

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
 
 

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
  
 

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)

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
 
 

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)

Docs/Layers/tree_node.md

@@ -61,10 +61,10 @@ 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/height#values) [height](https://wiki.openstreetmap.org/wiki/Key:height) | Multiple choice | 
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/leaf_type#values) [leaf_type](https://wiki.openstreetmap.org/wiki/Key:leaf_type) | Multiple choice | [broadleaved](https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dbroadleaved) [needleleaved](https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dneedleleaved)
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/denotation#values) [denotation](https://wiki.openstreetmap.org/wiki/Key:denotation) | Multiple choice | [landmark](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dlandmark) [natural_monument](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnatural_monument) [agricultural](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dagricultural) [park](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dpark) [garden](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dgarden) [avenue](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Davenue) [urban](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Durban) [none](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnone)
-[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/leaf_cycle#values) [leaf_cycle](https://wiki.openstreetmap.org/wiki/Key:leaf_cycle) | Multiple choice | [deciduous](https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Ddeciduous) [evergreen](https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Devergreen)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/species:wikidata#values) [species:wikidata](https://wiki.openstreetmap.org/wiki/Key:species:wikidata) | [wikidata](../SpecialInputElements.md#wikidata) | 
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/denotation#values) [denotation](https://wiki.openstreetmap.org/wiki/Key:denotation) | Multiple choice | [landmark](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dlandmark) [natural_monument](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnatural_monument) [agricultural](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dagricultural) [park](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dpark) [garden](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dgarden) [avenue](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Davenue) [urban](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Durban) [none](https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnone)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/leaf_type#values) [leaf_type](https://wiki.openstreetmap.org/wiki/Key:leaf_type) | Multiple choice | [broadleaved](https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dbroadleaved) [needleleaved](https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dneedleleaved)
+[<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/leaf_cycle#values) [leaf_cycle](https://wiki.openstreetmap.org/wiki/Key:leaf_cycle) | Multiple choice | [deciduous](https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Ddeciduous) [evergreen](https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Devergreen)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/name#values) [name](https://wiki.openstreetmap.org/wiki/Key:name) | [string](../SpecialInputElements.md#string) | [](https://wiki.openstreetmap.org/wiki/Tag:name%3D)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/heritage#values) [heritage](https://wiki.openstreetmap.org/wiki/Key:heritage) | Multiple choice | [4](https://wiki.openstreetmap.org/wiki/Tag:heritage%3D4) [4](https://wiki.openstreetmap.org/wiki/Tag:heritage%3D4) [yes](https://wiki.openstreetmap.org/wiki/Tag:heritage%3Dyes) [no](https://wiki.openstreetmap.org/wiki/Tag:heritage%3Dno)
 [<img src='https://mapcomplete.osm.be/assets/svg/statistics.svg' height='18px'>](https://taginfo.openstreetmap.org/keys/ref:OnroerendErfgoed#values) [ref:OnroerendErfgoed](https://wiki.openstreetmap.org/wiki/Key:ref:OnroerendErfgoed) | [nat](../SpecialInputElements.md#nat) | 
@@ -95,69 +95,23 @@ 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
 
 
 
-### tree-leaf_type 
+### plantnet 
 
 
 
-The question is  Is this a broadleaved or needleleaved tree?
+This tagrendering has no question and is thus read-only
 
 
 
 
 
-  - Broadleaved  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_type' target='_blank'>leaf_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dbroadleaved' target='_blank'>broadleaved</a>`
-  - Needleleaved  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_type' target='_blank'>leaf_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dneedleleaved' target='_blank'>needleleaved</a>`
-  - Permanently leafless  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_type' target='_blank'>leaf_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dleafless' target='_blank'>leafless</a>`
-  - This option cannot be chosen as answer
-
-
-
-
-### tree-denotation 
-
-
-
-The question is  How significant is this tree? Choose the first answer that applies.
-
-
-
-
-
-  - The tree is remarkable due to its size or prominent location. It is useful for navigation.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dlandmark' target='_blank'>landmark</a>`
-  - The tree is a natural monument, e.g. because it is especially old, or of a valuable species.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnatural_monument' target='_blank'>natural_monument</a>`
-  - The tree is used for agricultural purposes, e.g. in an orchard.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dagricultural' target='_blank'>agricultural</a>`
-  - The tree is in a park or similar (cemetery, school grounds, …).  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dpark' target='_blank'>park</a>`
-  - The tree is in a residential garden.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dgarden' target='_blank'>garden</a>`
-  - This is a tree along an avenue.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Davenue' target='_blank'>avenue</a>`
-  - The tree is in an urban area.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Durban' target='_blank'>urban</a>`
-  - The tree is outside of an urban area.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnone' target='_blank'>none</a>`
-
-
-
-
-### tree-decidouous 
-
-
-
-The question is  Is this tree evergreen or deciduous?
-
-
-
-
-
-  - Deciduous: the tree loses its leaves for some time of the year.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_cycle' target='_blank'>leaf_cycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Ddeciduous' target='_blank'>deciduous</a>`
-  - Evergreen.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_cycle' target='_blank'>leaf_cycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Devergreen' target='_blank'>evergreen</a>`
-
-
-
-
 ### tree-species-wikidata 
 
 
@@ -180,7 +134,63 @@ This tagrendering has no question and is thus read-only
 
 
 
-Only visible if  `wikipedia~^..*$|wikidata~^..*$`  is shown
+Only visible if  `wikipedia~.+|wikidata~.+`  is shown
+
+
+
+### tree-denotation 
+
+
+
+The question is  How significant is this tree? Choose the first answer that applies.
+
+
+
+
+
+  - The tree is remarkable due to its size or prominent location. It is useful for navigation.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dlandmark' target='_blank'>landmark</a>`
+  - The tree is a natural monument, e.g. because it is especially old, or of a valuable species.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnatural_monument' target='_blank'>natural_monument</a>`
+  - The tree is used for agricultural purposes, e.g. in an orchard.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dagricultural' target='_blank'>agricultural</a>`
+  - The tree is in a park or similar (cemetery, school grounds, …).  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dpark' target='_blank'>park</a>`
+  - The tree is in a residential garden.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dgarden' target='_blank'>garden</a>`
+  - This is a tree along an avenue.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Davenue' target='_blank'>avenue</a>`
+  - The tree is in an urban area.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Durban' target='_blank'>urban</a>`
+  - The tree is outside of an urban area.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:denotation' target='_blank'>denotation</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:denotation%3Dnone' target='_blank'>none</a>`
+
+
+
+
+### tree-leaf_type 
+
+
+
+The question is  Is this a broadleaved or needleleaved tree?
+
+
+
+
+
+  - Broadleaved  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_type' target='_blank'>leaf_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dbroadleaved' target='_blank'>broadleaved</a>`
+  - Needleleaved  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_type' target='_blank'>leaf_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dneedleleaved' target='_blank'>needleleaved</a>`
+  - Permanently leafless  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_type' target='_blank'>leaf_type</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_type%3Dleafless' target='_blank'>leafless</a>`
+  - This option cannot be chosen as answer
+
+
+
+
+### tree-decidouous 
+
+
+
+The question is  Is this tree evergreen or deciduous?
+
+
+
+
+
+  - Deciduous: the tree loses its leaves for some time of the year.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_cycle' target='_blank'>leaf_cycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Ddeciduous' target='_blank'>deciduous</a>`
+  - Evergreen.  corresponds with  `<a href='https://wiki.openstreetmap.org/wiki/Key:leaf_cycle' target='_blank'>leaf_cycle</a>=<a href='https://wiki.openstreetmap.org/wiki/Tag:leaf_cycle%3Devergreen' target='_blank'>evergreen</a>`
+
 
 
 
@@ -201,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
 
 
 
@@ -219,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
 
 
@@ -255,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)

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
 
 

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)

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
  
 

Docs/Making_Your_Own_Theme.md

@@ -15,7 +15,7 @@ Requirements
 Before you start, you should have the following qualifications:
 
 - You are a longtime contributor and do know the OpenStreetMap tagging scheme very well.
-- You are not afraid of editing a JSON file. If you don't know what a JSON-file is, [read this intro](https://www.w3schools.com/whatis/whatis_json.asp)
+- You are not afraid of editing a JSON file. If you don't know what a JSON file is, [read this intro](https://www.w3schools.com/whatis/whatis_json.asp)
 - Your theme will add well-understood tags (aka: the tags have a wiki page, are not controversial and are objective)
 - You are in contact with your local OpenStreetMap community and do know some other members to discuss tagging and to
   help testing
@@ -106,13 +106,13 @@ It asks some relevant questions, with the most important and easiests questions
 #### Don't: use a layer to filter
 
 **Do not define a layer which filters on an attribute**, such as <del>all restaurants with a vegetarian diet</del>, <del>all shops which accept bitcoin</del>.
-This makes _addition_ of new points difficult as information might not yet be known. Conser the following situation:
+This makes _addition_ of new points difficult as information might not yet be known. Consider the following situation:
 
 1. A theme defines a layer `vegetarian restaurants`, which matches `amenity=restaurant` & `diet:vegetarian=yes`.
 2. An object exists in OSM with `amenity=restaurant`;`name=Fancy Food`;`diet:vegan=yes`;`phone=...`;...
 3. A contributor visits the themes and will notice that _Fancy Food_ is missing
 4. The contributor will add _Fancy Food_
-5. There are now **two** Fancy Food objects in OSM.
+5. There are now **two** _Fancy Food_ objects in OSM.
 
 Instead, use the filter functionality instead. This can be used from the layer to hide some objects based on their properties.
 When the contributor wants to add a new point, they'll be notified that some features might be hidden and only be allowed to add a new point when the points are shown.
@@ -230,7 +230,7 @@ The entire tagRendering will thus be:
 The template
 ------------
 
-[A basic template is available here](https://github.com/pietervdvn/MapComplete/blob/develop/Docs/theme-template.json)
+[A basic template is available here](https://github.com/pietervdvn/MapComplete/blob/develop/Docs/theme-template.json).
 
 The custom theme generator
 --------------------------
@@ -258,7 +258,7 @@ If you have your JSON file, there are three ways to distribute your theme:
   up `https://mapcomplete.osm.be?userlayout=<url-to-the-raw.json>`
 - Ask to have your theme included into the official MapComplete - requirements below
 
-### Getting your theme included into the official mapcomplete
+### Getting your theme included into the official MapComplete
 
 Did you make an awesome theme that you want to share with the OpenStreetMap community? Have it included in the main
 application. This makes sure that:
@@ -314,15 +314,15 @@ There are three important levels in the JSON file:
 - A `layer` describes a layer. It contains the `name`, `icon`, `tags of objects to download from overpass`, and
   especially the `icon` and a way to dynamically render tags and ask questions. A lot of those fields (`icon`
   , `title`, ...) are actually a `TagRendering`.
-- A `TagRendering` is an object describing a relationship between what should be shown on screen and the OSM-tagging. It
+- A `TagRendering` is an object describing a relationship between what should be shown on screen and the OSM tagging. It
   works in two ways: if the correct tag is known, the appropriate text will be shown. If the tag is missing (and a
   question is defined), the question will be shown.
 
 Every field is documented in the source code itself - you can find them here:
 
-- [The top level `LayoutConfig`](https://github.com/pietervdvn/MapComplete/blob/master/Models/ThemeConfig/Json/LayoutConfigJson.ts)
+- [The top level `LayoutConfig`](/Models/ThemeConfig/Json/LayoutConfigJson.ts)
-- [A layer object `LayerConfig`](https://github.com/pietervdvn/MapComplete/blob/master/Models/ThemeConfig/Json/LayerConfigJson.ts)
+- [A layer object `LayerConfig`](/Models/ThemeConfig/Json/LayerConfigJson.ts)
-- [The `TagRendering`](https://github.com/pietervdvn/MapComplete/blob/master/Models/ThemeConfig/Json/TagRenderingConfigJson.ts)
+- [The `TagRendering`](/Models/ThemeConfig/Json/TagRenderingConfigJson.ts)
 - At last, the exact semantics of tags are documented [here](Tags_format.md)
 
 A JSON schema file is available in `Docs/Schemas` - use `LayoutConfig.schema.json` to validate a theme file.
@@ -334,7 +334,7 @@ in. [An overview of all these metatags is available here](CalculatedTags.md).
 
 ### TagRendering groups
 
-A `tagRendering` can have a `group`-attribute, which acts as a tag. All `tagRendering`s with the same group name will be
+A `tagRendering` can have a `group` attribute, which acts as a tag. All `tagRendering`s with the same group name will be
 rendered together, in the same order as they were defined.
 
 For example, if the defined `tagRendering`s have groups `A A B A A B B B`, the group order is `A B` and first all
@@ -411,7 +411,7 @@ Some pitfalls
 ### Not publishing
 
 Not publishing because 'it is not good enough'. _Share your theme, even if it is still not great, let the community help
-it improve_
+improve it._
 
 ### Thinking in terms of a question
 
@@ -423,7 +423,7 @@ The correct way to handle this is to use _This bench does have a backrest_ and _
 answers.
 
 One has to think first in terms of _what is shown to the user if it is known_, only then in terms of _what is the
-question I want to ask_
+question I want to ask_.
 
 ### Forgetting the casual/noob mapper
 
@@ -437,7 +437,7 @@ In order to maximize contribution:
 4. Make sure the icons (on the map and in the questions) are big enough, clear enough and contrast enough with the
    background map
 
-### Using layers to distinguish on attributes
+### Using layers to distinguish different object subtypes by attributes
 
 One layer should portray one kind of physical object, e.g. "benches" or "restaurants". It should contain all of them,
 disregarding other properties.
@@ -459,6 +459,6 @@ through!
 Some new contributors might add a POI to indicate something that resembles it, but quite isn't.
 
 For example, if they are only offered a layer with public bookcases, they might map their local library with a public bookcase.
-The perfect solution for this is to provide both the library-layer and public bookcases layer - but this requires having both layers.
+The perfect solution for this is to provide both the library layer and public bookcases layer - but this requires having both layers.
 
 A good solution is to clearly explain what a certain feature is and what it is not.

Docs/SpecialRenderings.md

@@ -112,6 +112,8 @@ Instead of using `{"render": {"en": "{some_special_visualisation(some_arg, some
       * [Example usage of multi](#example-usage-of-multi)
     + [steal](#steal)
       * [Example usage of steal](#example-usage-of-steal)
+    + [plantnet_detection](#plantnet_detection)
+      * [Example usage of plantnet_detection](#example-usage-of-plantnet_detection)
     + [auto_apply](#auto_apply)
       * [Example usage of auto_apply](#example-usage-of-auto_apply)
 
@@ -197,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 
@@ -786,7 +788,8 @@ tagrendering | _undefined_ | An entire tagRenderingConfig
       }
     }
   }
-}```
+}
+```
 
 
 
@@ -806,6 +809,21 @@ tagRenderingId | _undefined_ | The layer-id and tagRenderingId to render. Can be
 
 
 
+### plantnet_detection 
+
+ Sends the images linked to the current object to plantnet.org and asks it what plant species is shown on it. The user can then select the correct species; the corresponding wikidata-identifier will then be added to the object (together with `source:species:wikidata=plantnet.org AI`).  
+
+name | default | description
+------ | --------- | -------------
+image_key | image,mapillary,image,wikidata,wikimedia_commons,image,image | The keys given to the images, e.g. if <span class='literal-code'>image</span> is given, the first picture URL will be added as <span class='literal-code'>image</span>, the second as <span class='literal-code'>image:0</span>, the third as <span class='literal-code'>image:1</span>, etc... Multiple values are allowed if ';'-separated 
+ 
+
+#### Example usage of plantnet_detection 
+
+ `{plantnet_detection(image,mapillary,image,wikidata,wikimedia_commons,image,image)}`
+
+
+
 ### auto_apply 
 
  A button to run many actions for many features at once. To effectively use this button, you'll need some ingredients: