diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json
index 0bc027b..b7125fd 100644
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@@ -59,7 +59,6 @@
         "if": {
           "and": [
             "shop=sports",
-            "name~*"
           ]
         },
         "then": {
@@ -68,18 +67,10 @@
           "fr": "Magasin de sport <i>{name}</i>"
         }
       },
-      {
-        "if": "shop=sports",
-        "then": {
-          "en": "Sport gear shop",
-          "nl": "Sportwinkel",
-          "fr": "Magasin de sport"
-        }
-      },
       {
         "if": {
           "and": [
-            "shop!~bicycle",
+            "shop!~.*bicycle.*",
             "shop~*"
           ]
         },
@@ -88,9 +79,24 @@
       {
         "if": {
           "and": [
-            "name~*",
+            {
+              "or": [
+                "service:bicycle:rental=yes",
+                "amenity=bicycle_rental"
+              ]
+            }
+          ]
+        },
+        "then": {
+          "nl": "Fietsverhuur <i>{name}</i>",
+          "en": "Bicycle rental <i>{name}</i>"
+        }
+      },
+      {
+        "if": {
+          "and": [
             "service:bicycle:retail!~yes",
-            "service:bicycle:repair!~no"
+            "service:bicycle:repair=yes"
           ]
         },
         "then": {
@@ -104,22 +110,6 @@
       {
         "if": {
           "and": [
-            "service:bicycle:retail!~yes",
-            "service:bicycle:repair!~no"
-          ]
-        },
-        "then": {
-          "en": "Bike repair",
-          "nl": "Fietsenmaker",
-          "fr": "Réparateur de vélo",
-          "gl": "Arranxo de bicicletas",
-          "de": "Fahrradwerkstatt"
-        }
-      },
-      {
-        "if": {
-          "and": [
-            "name~*",
             "service:bicycle:repair!~yes"
           ]
         },
@@ -131,33 +121,6 @@
           "de": "Fahrradgeschäft <i>{name}</i>"
         }
       },
-      {
-        "if": "service:bicycle:repair!~yes",
-        "then": {
-          "en": "Bike shop",
-          "nl": "Fietswinkel",
-          "fr": "Magasin de vélo",
-          "gl": "Tenda de bicicletas",
-          "de": "Fahrradgeschäft"
-        }
-      },
-      {
-        "if": {
-          "and": [
-            "name~*",
-            {
-              "or": [
-                "service:bicycle:rental=yes",
-                "amenity=bicycle_rental"
-              ]
-            }
-          ]
-        },
-        "then": {
-          "nl": "Fietsverhuur <i>{name}</i>",
-          "en": "Bicycle rental <i>{name}</i>"
-        }
-      },
       {
         "if": "name~*",
         "then": {