diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7ffcd09b3..33cf0f5c6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8051,7 +8051,8 @@
             "area"
         ],
         "tags": {
-            "shop": "organic"
+            "shop": "supermarket",
+            "organic": "true"
         },
         "name": "Organic Goods Store"
     },
diff --git a/data/presets/presets/shop/organic.json b/data/presets/presets/shop/organic.json
index f0cd0edc7..e51a26b1c 100644
--- a/data/presets/presets/shop/organic.json
+++ b/data/presets/presets/shop/organic.json
@@ -11,7 +11,8 @@
         "area"
     ],
     "tags": {
-        "shop": "organic"
+        "shop": "supermarket",
+        "organic": "true"
     },
     "name": "Organic Goods Store"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 203b266d7..212c77631 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1893,8 +1893,8 @@
             "value": "optician"
         },
         {
-            "key": "shop",
-            "value": "organic"
+            "key": "organic",
+            "value": "true"
         },
         {
             "key": "shop",