diff --git a/assets/layers/bike_cafe/bike_cafe.json b/assets/layers/bike_cafe/bike_cafe.json
index d95f763..7b4a326 100644
--- a/assets/layers/bike_cafe/bike_cafe.json
+++ b/assets/layers/bike_cafe/bike_cafe.json
@@ -22,8 +22,10 @@
         {
           "#": "Note the double tilde in 'service:bicycle' which interprets the key as regex too",
           "or": [
-            "pub~cycling|bicycle",
-            "theme~cycling|bicycle",
+            "pub=cycling",
+            "pub=bicycle",
+            "theme=cycling",
+            "theme=bicycle",
             "service:bicycle:.*~~*"
           ]
         }
diff --git a/assets/layers/bike_themed_object/bike_themed_object.json b/assets/layers/bike_themed_object/bike_themed_object.json
index 9d1db2c..8709b71 100644
--- a/assets/layers/bike_themed_object/bike_themed_object.json
+++ b/assets/layers/bike_themed_object/bike_themed_object.json
@@ -10,11 +10,16 @@
   "source": {
     "osmTags": {
       "or": [
-        "theme~cycling|bicycle",
+        "theme=bicycle",
+        "theme=cycling",
         "sport=cycling",
-        "association~cycling|bicycle",
-        "ngo~cycling|bicycle",
-        "club~bicycle|cycling"
+        "association=cycling",
+        "association=bicycle",
+        "ngo=cycling",
+        "ngo=bicycle",
+
+        "club=bicycle",
+        "club=cycling"
       ]
     }
   },
diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json
index 7409e12..b0a5ceb 100644
--- a/assets/themes/cyclestreets/cyclestreets.json
+++ b/assets/themes/cyclestreets/cyclestreets.json
@@ -165,7 +165,13 @@
         "nl": "Laag waar je een straat als fietsstraat kan markeren"
       },
       "source": {
-        "osmTags": "highway~residential|tertiary|unclassified"
+        "osmTags": {
+          "or": [
+            "highway=residential",
+            "highway=tertiary",
+            "highway=unclassified"
+          ]
+        }
       },
       "minzoom": 18,
       "wayHandling": 0,