diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index 39523b933..17f1ed37f 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -1665,9 +1665,30 @@
         }
       }
     },
+    {
+      "builtin": "self_checkout",
+      "override": {
+        "+mappings": [
+          {
+            "if": {
+              "and": [
+                "self_checkout=",
+                "shop!=supermarket",
+                "shop!=convenience",
+                "shop!=chemist"
+              ]
+            },
+            "then": {
+              "en": "This shop (probably) does not offer self-checkout"
+            },
+            "hideInAnswer": true
+          }
+        ]
+      }
+    },
+    "self_checkout_type",
     "description",
-    "toilet_at_amenity_lib.all",
-    "self_checkout_questions"
+    "toilet_at_amenity_lib.all"
   ],
   "filter": [
     {