diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fa557254..a3c1a1f5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -155,6 +155,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 * Add Utility Pole preset ([#6848])
 * Add Karting Racetrack and Motocross Racetrack presets ([#6826])
 * Add Noise Barrier preset ([#6949])
+* Add Brewing Supply Store preset ([#6866], [#6955], thanks [@simonbilskyrollins])
 * Add presets: Spaceport, Hot Dog Fast Food, Recording Studio, Film Studio, Radio Station, Television Station, Truck Scale, City Hall
 * Add Type and Material fields to the Stile preset ([#6857], thanks [@ewnh])
 * Add Waste field to relevant presets ([#6821])
@@ -188,6 +189,7 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [#6882]: https://github.com/openstreetmap/iD/issues/6882
 [#6825]: https://github.com/openstreetmap/iD/issues/6825
 
+[@simonbilskyrollins]: https://github.com/simonbilskyrollins
 [@danielsjf]: https://github.com/danielsjf
 [@ewnh]: https://github.com/ewnh
 
diff --git a/data/presets.yaml b/data/presets.yaml
index c7c030c6f..66664ef62 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -478,7 +478,6 @@ en:
       craft:
         # craft=*
         label: Type
-        terms: '[translate with synonyms or related terms for ''Type'', separated by commas]'
       crane/type:
         # 'crane:type=*'
         label: Crane Type
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5bdf01591..e59655540 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1015,7 +1015,7 @@
     "shop/boat": {"icon": "temaki-boating", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"},
     "shop/bookmaker": {"icon": "temaki-money_hand", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
     "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"},
-    "shop/brewing_supplies": {"icon": "fas-beer", "moreFields": ["{shop}", "craft"], "geometry": ["point", "area"], "terms": ["brew shop", "homebrew supply store"], "tags": {"shop": "brewing_supplies"}, "name": "Brewing Supply Store"},
+    "shop/brewing_supplies": {"icon": "fas-beer", "geometry": ["point", "area"], "terms": ["brew shop", "homebrew supply store"], "tags": {"shop": "brewing_supplies"}, "name": "Brewing Supply Store"},
     "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"},
     "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"},
     "shop/cannabis": {"icon": "fas-cannabis", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"},
diff --git a/data/presets/presets/shop/brewing_supplies.json b/data/presets/presets/shop/brewing_supplies.json
index b07af1796..3d66ba9e3 100644
--- a/data/presets/presets/shop/brewing_supplies.json
+++ b/data/presets/presets/shop/brewing_supplies.json
@@ -1,9 +1,5 @@
 {
     "icon": "fas-beer",
-    "moreFields": [
-        "{shop}",
-        "craft"
-    ],
     "geometry": [
         "point",
         "area"