diff --git a/assets/themes/velopark/velopark.css b/assets/themes/velopark/velopark.css
new file mode 100644
index 0000000000..f386afc2e1
--- /dev/null
+++ b/assets/themes/velopark/velopark.css
@@ -0,0 +1,3 @@
+.tr-qr_code , .tr-favourite_status {
+    display: none;
+}
diff --git a/assets/themes/velopark/velopark.json b/assets/themes/velopark/velopark.json
index c0a07ebcc4..270e5e4ca1 100644
--- a/assets/themes/velopark/velopark.json
+++ b/assets/themes/velopark/velopark.json
@@ -4,6 +4,7 @@
     "en": "Velopark to OpenStreetMap synchronisation tool",
     "nl": "Velopark naar OpenStreetMap sync tool"
   },
+  "customCss": "./assets/themes/velopark/velopark.css",
   "mustHaveLanguage": [
     "nl",
     "en"
@@ -309,9 +310,7 @@
       ],
       "hideTagRenderingsWithLabels": [
         "images",
-        "leftover-questions",
-        "qr_code",
-        "favourite_status"
+        "leftover-questions"
       ],
       "override": {
         "id": "bike_parking_with_velopark_ref",
@@ -395,9 +394,7 @@
       ],
       "hideTagRenderingsWithLabels": [
         "images",
-        "leftover-questions",
-        "qr_code",
-        "favourite_status"
+        "leftover-questions"
       ],
       "override": {
         "doCount": false,
diff --git a/src/Models/ThemeConfig/LayoutConfig.ts b/src/Models/ThemeConfig/LayoutConfig.ts
index 02672bbf10..50a9818d7a 100644
--- a/src/Models/ThemeConfig/LayoutConfig.ts
+++ b/src/Models/ThemeConfig/LayoutConfig.ts
@@ -315,7 +315,9 @@ export default class LayoutConfig implements LayoutInformation {
                 continue
             }
             if (layer.source.osmTags.matchesProperties(tags)) {
-                return layer
+                if(!layer.isShown || layer.isShown.matchesProperties(tags)){// https://github.com/pietervdvn/MapComplete/issues/1959
+                    return layer
+                }
             }
         }
         console.log("Fallthrough", this, tags)
diff --git a/src/UI/Popup/TagApplyButton.ts b/src/UI/Popup/TagApplyButton.ts
index f831f8c9e1..c42d0debdd 100644
--- a/src/UI/Popup/TagApplyButton.ts
+++ b/src/UI/Popup/TagApplyButton.ts
@@ -193,7 +193,7 @@ export default class TagApplyButton implements AutoAction, SpecialVisualization
                 }
                 return el
             })
-        ).SetClass("subtle")
+        ).SetClass("subtle break-all")
         const applied = new UIEventSource(
             tags?.data?.["mr_taskStatus"] !== undefined &&
                 tags?.data?.["mr_taskStatus"] !== "Created"