diff --git a/assets/themes/shops/shops.json b/assets/themes/shops/shops.json
index 66a6d19f1..7c1ef5543 100644
--- a/assets/themes/shops/shops.json
+++ b/assets/themes/shops/shops.json
@@ -50,13 +50,24 @@
   },
   "icon": "./assets/themes/shops/shop.svg",
   "layers": [
-    "shops",
-    "pharmacy",
-    "ice_cream",
-    "trolley_bay"
-  ],
-  "overrideAll": {
-    "minzoom": 12,
-    "syncSelection": "theme-only"
-  }
+    {
+      "builtin": [
+        "shops",
+        "pharmacy",
+        "ice_cream"
+      ],
+      "override": {
+        "minzoom": 12,
+        "syncSelection": "theme-only"
+      }
+    },
+    {
+      "builtin": [
+        "trolley_bay"
+      ],
+      "override": {
+        "syncSelection": "theme-only"
+      }
+    }
+  ]
 }