diff --git a/assets/themes/scouting/scouting.json b/assets/themes/scouting/scouting.json
index 7323ac68e..65b48679c 100644
--- a/assets/themes/scouting/scouting.json
+++ b/assets/themes/scouting/scouting.json
@@ -26,9 +26,13 @@
           "=osmTags": {
             "and": [
               "tourism=camp_site",
+              "scout!=no",
+              "group!=no",
               {
                 "or": [
                   "scout=yes",
+                  "scout=only",
+                  "group=yes",
                   "group_only=yes"
                 ]
               }
@@ -62,9 +66,13 @@
           "=osmTags": {
             "and": [
               "tourism=hostel",
+              "scout!=no",
+              "group!=no",
               {
                 "or": [
                   "scout=yes",
+                  "scout=only",
+                  "group=yes",
                   "group_only=yes"
                 ]
               }