diff --git a/data/core.yaml b/data/core.yaml
index 134244c28..980d5ef53 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -160,7 +160,7 @@ en:
     new_tag: New tag
     view_on_osm: View on openstreetmap.org
     editing_feature: "Editing {feature}"
-    additional: Additional tags
+    all_tags: All tags
     choose: Select feature type
     results: "{n} results for {search}"
     reference: View on OpenStreetMap Wiki
diff --git a/data/presets.yaml b/data/presets.yaml
index bd9b06a99..b1702c025 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -787,7 +787,7 @@ en:
         terms: ""
       shop/alcohol: 
         name: Liquor Store
-        terms: ""
+        terms: alcohol
       shop/bakery: 
         name: Bakery
         terms: ""
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f3bef1954..10e78bd78 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -194,6 +194,9 @@
         "tags": {
             "amenity": "car_wash"
         },
+        "fields": [
+            "building_area"
+        ],
         "name": "Car Wash"
     },
     "amenity/cinema": {
@@ -256,7 +259,8 @@
             "amenity": "embassy"
         },
         "fields": [
-            "country"
+            "country",
+            "building_area"
         ],
         "icon": "embassy",
         "name": "Embassy"
@@ -311,7 +315,8 @@
         "icon": "fuel",
         "fields": [
             "operator",
-            "address"
+            "address",
+            "building_yes"
         ],
         "geometry": [
             "point",
@@ -397,6 +402,9 @@
         "tags": {
             "amenity": "marketplace"
         },
+        "fields": [
+            "building"
+        ],
         "name": "Marketplace"
     },
     "amenity/parking": {
@@ -485,7 +493,7 @@
         "icon": "religious-christian",
         "fields": [
             "denomination",
-            "building",
+            "building_yes",
             "address"
         ],
         "geometry": [
@@ -527,7 +535,7 @@
         "icon": "religious-jewish",
         "fields": [
             "denomination",
-            "building",
+            "building_yes",
             "address"
         ],
         "geometry": [
@@ -549,7 +557,7 @@
         "icon": "religious-muslim",
         "fields": [
             "denomination",
-            "building",
+            "building_yes",
             "address"
         ],
         "geometry": [
@@ -641,7 +649,8 @@
         "icon": "post",
         "fields": [
             "operator",
-            "collection_times"
+            "collection_times",
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -2996,6 +3005,7 @@
         "icon": "alcohol-shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3006,12 +3016,16 @@
         "tags": {
             "shop": "alcohol"
         },
+        "terms": [
+            "alcohol"
+        ],
         "name": "Liquor Store"
     },
     "shop/bakery": {
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3028,6 +3042,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3044,6 +3059,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3060,6 +3076,7 @@
         "icon": "bicycle",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3076,6 +3093,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3092,6 +3110,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3125,6 +3144,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3141,6 +3161,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3157,6 +3178,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3173,6 +3195,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3189,6 +3212,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3205,6 +3229,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3221,6 +3246,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3237,6 +3263,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3253,6 +3280,7 @@
         "icon": "restaurant",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3269,6 +3297,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3285,6 +3314,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3301,6 +3331,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3317,6 +3348,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3333,6 +3365,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3349,6 +3382,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3365,6 +3399,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3381,6 +3416,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3397,6 +3433,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3413,6 +3450,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3429,6 +3467,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3445,6 +3484,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3461,6 +3501,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3477,6 +3518,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3493,6 +3535,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3509,6 +3552,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3525,6 +3569,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3541,6 +3586,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3557,6 +3603,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3573,6 +3620,7 @@
         "icon": "music",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3589,6 +3637,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3605,6 +3654,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3621,6 +3671,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3637,6 +3688,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3653,6 +3705,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3669,6 +3722,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3685,6 +3739,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3740,6 +3795,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3756,6 +3812,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3772,6 +3829,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3788,6 +3846,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3804,6 +3863,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -3820,6 +3880,7 @@
         "icon": "shop",
         "fields": [
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e3b83a534..3b67df4a8 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -199,7 +199,7 @@
         "new_tag": "New tag",
         "view_on_osm": "View on openstreetmap.org",
         "editing_feature": "Editing {feature}",
-        "additional": "Additional tags",
+        "all_tags": "All tags",
         "choose": "Select feature type",
         "results": "{n} results for {search}",
         "reference": "View on OpenStreetMap Wiki",
@@ -1387,7 +1387,7 @@
             },
             "shop/alcohol": {
                 "name": "Liquor Store",
-                "terms": ""
+                "terms": "alcohol"
             },
             "shop/bakery": {
                 "name": "Bakery",
diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index ea47aae3c..cb8eca31e 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -114,10 +114,7 @@ iD.ui.TagEditor = function(context, entity) {
             }
 
             presetUI.change(tags);
-            var rendered = []
-                .concat(Object.keys(preset.tags))
-                .concat(presetUI.rendered());
-            tagList.tags(_.omit(tags, rendered));
+            tagList.tags(tags);
         }
         return tageditor;
     };
diff --git a/js/id/ui/taglist.js b/js/id/ui/taglist.js
index 9a50f8084..3b3442176 100644
--- a/js/id/ui/taglist.js
+++ b/js/id/ui/taglist.js
@@ -9,7 +9,7 @@ iD.ui.Taglist = function(context, entity) {
         collapsebutton = selection.append('a')
             .attr('href','#')
             .attr('class','hide-toggle')
-            .text(t('inspector.additional'))
+            .text(t('inspector.all_tags'))
             .on('click', function() {
                 iD.ui.Taglist.expanded = wrap.classed('hide');
                 collapsebutton.classed('expanded', iD.ui.Taglist.expanded);
@@ -39,7 +39,7 @@ iD.ui.Taglist = function(context, entity) {
     function drawTags(tags) {
 
         var count = Object.keys(tags).filter(function(d) { return d; }).length;
-        collapsebutton.text(t('inspector.additional') + ' (' + count + ')');
+        collapsebutton.text(t('inspector.all_tags') + ' (' + count + ')');
 
         tags = d3.entries(tags);