diff --git a/osm_fieldwork/data_models/amenities.yaml b/osm_fieldwork/data_models/amenities.yaml
index 7c9f1570c..81806529e 100644
--- a/osm_fieldwork/data_models/amenities.yaml
+++ b/osm_fieldwork/data_models/amenities.yaml
@@ -9,7 +9,15 @@ where:
         - cafe
         - bar
         - pub
-    - shop: not null
+        - restaurant
+        - fuel
+    - shop:
+        - convenience
+        - supermarket
+        - bakery
+        - alcohol
+        - greengrocer
+        - farm
 
 keep:
   - leisure