diff --git a/data/presets.yaml b/data/presets.yaml
index 6e14bbc04..720bb8104 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -46,7 +46,7 @@ en:
           destination: 
             title: Destination
             description: Access permitted only to reach a destination
-      access_toilets: 
+      access_simple: 
         label: Access
       address: 
         label: Address
@@ -80,8 +80,6 @@ en:
         label: Building
       building_area: 
         label: Building
-      building_yes: 
-        label: Building
       capacity: 
         label: Capacity
         placeholder: "50, 100, 200..."
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 8eeb45d9b..694c6b897 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -46,7 +46,7 @@
             }
         }
     },
-    "access_toilets": {
+    "access_simple": {
         "key": "access",
         "type": "combo",
         "label": "Access",
@@ -141,12 +141,6 @@
         "geometry": "area",
         "label": "Building"
     },
-    "building_yes": {
-        "key": "building",
-        "type": "combo",
-        "default": "yes",
-        "label": "Building"
-    },
     "capacity": {
         "key": "capacity",
         "type": "number",
diff --git a/data/presets/fields/building_yes.json b/data/presets/fields/building_yes.json
deleted file mode 100644
index 6a61a665f..000000000
--- a/data/presets/fields/building_yes.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "key": "building",
-    "type": "combo",
-    "default": "yes",
-    "label": "Building"
-}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8cdb79ea4..1545c1ef8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -555,7 +555,7 @@
         "fields": [
             "operator",
             "address",
-            "building_yes"
+            "building_area"
         ],
         "geometry": [
             "point",
@@ -681,6 +681,7 @@
             "parking",
             "capacity",
             "fee",
+            "access_simple",
             "supervised",
             "park_ride",
             "address"
@@ -761,7 +762,7 @@
         "icon": "place-of-worship",
         "fields": [
             "denomination",
-            "building_yes",
+            "building_area",
             "address"
         ],
         "geometry": [
@@ -788,7 +789,7 @@
         "icon": "religious-christian",
         "fields": [
             "denomination",
-            "building_yes",
+            "building_area",
             "address"
         ],
         "geometry": [
@@ -830,7 +831,7 @@
         "icon": "religious-jewish",
         "fields": [
             "denomination",
-            "building_yes",
+            "building_area",
             "address"
         ],
         "geometry": [
@@ -852,7 +853,7 @@
         "icon": "religious-muslim",
         "fields": [
             "denomination",
-            "building_yes",
+            "building_area",
             "address"
         ],
         "geometry": [
@@ -1171,7 +1172,8 @@
             "toilets/disposal",
             "operator",
             "building_area",
-            "access_toilets"
+            "fee",
+            "access_simple"
         ],
         "geometry": [
             "point",
@@ -1493,7 +1495,7 @@
     "building": {
         "icon": "building",
         "fields": [
-            "building_yes",
+            "building",
             "levels",
             "address"
         ],
@@ -1666,6 +1668,7 @@
         },
         "fields": [
             "entrance",
+            "access_simple",
             "address"
         ],
         "name": "Entrance"
@@ -2947,6 +2950,9 @@
         "name": "Stadium"
     },
     "leisure/swimming_pool": {
+        "fields": [
+            "access_simple"
+        ],
         "geometry": [
             "point",
             "vertex",
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index fe42e0911..011b5d361 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -3,7 +3,7 @@
     "fields": [
         "operator",
         "address",
-        "building_yes"
+        "building_area"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/place_of_worship/buddhist.json b/data/presets/presets/amenity/place_of_worship/buddhist.json
index 3fa94195e..8bab80f9b 100644
--- a/data/presets/presets/amenity/place_of_worship/buddhist.json
+++ b/data/presets/presets/amenity/place_of_worship/buddhist.json
@@ -2,7 +2,7 @@
     "icon": "place-of-worship",
     "fields": [
         "denomination",
-        "building_yes",
+        "building_area",
         "address"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
index fa5bfb0d8..00ed6724b 100644
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -2,7 +2,7 @@
     "icon": "religious-christian",
     "fields": [
         "denomination",
-        "building_yes",
+        "building_area",
         "address"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/place_of_worship/jewish.json b/data/presets/presets/amenity/place_of_worship/jewish.json
index c9b4b99c2..617323caa 100644
--- a/data/presets/presets/amenity/place_of_worship/jewish.json
+++ b/data/presets/presets/amenity/place_of_worship/jewish.json
@@ -2,7 +2,7 @@
     "icon": "religious-jewish",
     "fields": [
         "denomination",
-        "building_yes",
+        "building_area",
         "address"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/place_of_worship/muslim.json b/data/presets/presets/amenity/place_of_worship/muslim.json
index aab7017bc..983159938 100644
--- a/data/presets/presets/amenity/place_of_worship/muslim.json
+++ b/data/presets/presets/amenity/place_of_worship/muslim.json
@@ -2,7 +2,7 @@
     "icon": "religious-muslim",
     "fields": [
         "denomination",
-        "building_yes",
+        "building_area",
         "address"
     ],
     "geometry": [
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index 9bf5ad145..e25911488 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -1,7 +1,7 @@
 {
     "icon": "building",
     "fields": [
-        "building_yes",
+        "building",
         "levels",
         "address"
     ],
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 5c87e7a7f..d47d91acc 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -455,7 +455,7 @@
                     }
                 }
             },
-            "access_toilets": {
+            "access_simple": {
                 "label": "Access"
             },
             "address": {
@@ -504,9 +504,6 @@
             "building_area": {
                 "label": "Building"
             },
-            "building_yes": {
-                "label": "Building"
-            },
             "capacity": {
                 "label": "Capacity",
                 "placeholder": "50, 100, 200..."