diff --git a/assets/layers/bike_shop/bike_shop.json b/assets/layers/bike_shop/bike_shop.json
index d9a619605..75f023466 100644
--- a/assets/layers/bike_shop/bike_shop.json
+++ b/assets/layers/bike_shop/bike_shop.json
@@ -34,6 +34,8 @@
       "#": "We select all bicycle shops, sports shops (but we try to weed out non-bicycle related shops), and any shop with a bicycle related tag",
       "or": [
         "shop=bicycle",
+        "service:bicycle:retail=yes",
+        "service:bicycle:repair=yes",
         {
           "#": "if sport is defined and is not bicycle, it is not matched; if bicycle retail/repair is marked as 'no', it is not shown to too.",
           "##": "There will be a few false-positives with this. They will get filtered out by people marking both 'not selling bikes' and 'not repairing bikes'. Furthermore, the OSMers will add a sports-subcategory on it",
diff --git a/src/Models/ThemeConfig/Conversion/Validation.ts b/src/Models/ThemeConfig/Conversion/Validation.ts
index f8cddc46c..cd07d94a2 100644
--- a/src/Models/ThemeConfig/Conversion/Validation.ts
+++ b/src/Models/ThemeConfig/Conversion/Validation.ts
@@ -1990,6 +1990,9 @@ export class ValidateThemeEnsemble extends Conversion<
         >()
 
         for (const theme of json) {
+            if(theme.id === "personal"){
+                continue
+            }
             for (const layer of theme.layers) {
                 if (typeof layer.source === "string") {
                     continue