diff --git a/data/presets.yaml b/data/presets.yaml
index c0d836122..983a52eb7 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -591,6 +591,12 @@ en:
           'no': Not Allowed
           # dog=yes
           'yes': Allowed
+      door:
+        # door=*
+        label: Door
+      door_type:
+        # door=*
+        label: Type
       drive_through:
         # drive_through=*
         label: Drive-Through
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 9cf243465..2b15cd636 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -102,6 +102,8 @@
     "distance": {"key": "distance", "type": "text", "label": "Distance"},
     "dock": {"key": "dock", "type": "combo", "label": "Type"},
     "dog": {"key": "dog", "type": "combo", "label": "Dogs", "strings": {"options": {"yes": "Allowed", "leashed": "Leashed Only", "no": "Not Allowed"}}},
+    "door_type": {"key": "door", "type": "typeCombo", "label": "Type"},
+    "door": {"key": "door", "type": "combo", "label": "Door"},
     "drive_through": {"key": "drive_through", "type": "check", "label": "Drive-Through"},
     "duration": {"key": "duration", "type": "text", "label": "Duration", "placeholder": "00:00"},
     "electrified": {"key": "electrified", "type": "combo", "label": "Electrification", "placeholder": "Contact Line, Electrified Rail...", "strings": {"options": {"contact_line": "Contact Line", "rail": "Electrified Rail", "yes": "Yes (unspecified)", "no": "No"}}},
diff --git a/data/presets/fields/door.json b/data/presets/fields/door.json
new file mode 100644
index 000000000..5bb875c1d
--- /dev/null
+++ b/data/presets/fields/door.json
@@ -0,0 +1,5 @@
+{
+    "key": "door",
+    "type": "combo",
+    "label": "Door"
+}
diff --git a/data/presets/fields/door_type.json b/data/presets/fields/door_type.json
new file mode 100644
index 000000000..7135017e3
--- /dev/null
+++ b/data/presets/fields/door_type.json
@@ -0,0 +1,5 @@
+{
+    "key": "door",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9d52c73c0..07ba6801e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -388,7 +388,7 @@
     "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
     "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
-    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"},
+    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
     "ford": {"geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
     "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "reference": {"key": "golf", "value": "bunker"}, "name": "Sand Trap"},
     "golf/cartpath_service": {"icon": "maki-golf", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"highway": "service", "golf": "cartpath", "golf_cart": "designated"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath / Service Road"},
@@ -497,7 +497,7 @@
     "indoor/corridor_line": {"fields": ["level", "name"], "geometry": ["line"], "tags": {"indoor": "corridor"}, "searchable": false, "matchScore": 1.1, "name": "Indoor Corridor", "replacement": "highway/corridor"},
     "indoor/area": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "area"}, "terms": ["indoor space"], "matchScore": 0.8, "name": "Indoor Area"},
     "indoor/corridor": {"icon": "temaki-pedestrian", "fields": ["level", "name", "ref", "height"], "geometry": ["area"], "tags": {"indoor": "corridor"}, "terms": ["concourse", "foyer", "hallway", "passageway"], "matchScore": 0.8, "name": "Indoor Corridor"},
-    "indoor/door": {"icon": "maki-entrance-alt1", "fields": ["level", "ref", "width", "height"], "geometry": ["vertex"], "tags": {"indoor": "door"}, "addTags": {"indoor": "door", "entrance": "yes"}, "removeTags": {"indoor": "door", "entrance": "yes"}, "terms": ["doorframe", "doorway", "portal", "room access", "threshold"], "name": "Indoor Door"},
+    "indoor/door": {"icon": "maki-entrance-alt1", "fields": ["level", "ref", "door_type", "access_simple", "width", "height"], "moreFields": ["wheelchair"], "geometry": ["vertex"], "tags": {"indoor": "door"}, "addTags": {"indoor": "door", "door": "yes"}, "removeTags": {"indoor": "door", "door": "*"}, "terms": ["doorframe", "doorway", "portal", "room access", "threshold"], "name": "Indoor Door"},
     "indoor/room": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "room"}, "terms": ["antechamber", "anteroom", "atrium", "cell", "chamber", "concourse", "foyer", "indoor room", "lobby", "vestibule"], "matchScore": 0.8, "name": "Room"},
     "indoor/wall": {"icon": "temaki-wall", "fields": ["level", "height"], "geometry": ["line"], "tags": {"indoor": "wall"}, "terms": ["indoor barrier", "room divider", "room partition"], "name": "Indoor Wall"},
     "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json
index 8d646f038..d63a5609b 100644
--- a/data/presets/presets/entrance.json
+++ b/data/presets/presets/entrance.json
@@ -13,8 +13,10 @@
     },
     "fields": [
         "entrance",
+        "door",
         "access_simple",
         "address"
     ],
+    "matchScore": 0.8,
     "name": "Entrance/Exit"
 }
diff --git a/data/presets/presets/indoor/door.json b/data/presets/presets/indoor/door.json
index 16ed082b1..c13d2c71b 100644
--- a/data/presets/presets/indoor/door.json
+++ b/data/presets/presets/indoor/door.json
@@ -3,9 +3,14 @@
     "fields": [
         "level",
         "ref",
+        "door_type",
+        "access_simple",
         "width",
         "height"
     ],
+    "moreFields": [
+        "wheelchair"
+    ],
     "geometry": [
         "vertex"
     ],
@@ -14,11 +19,11 @@
     },
     "addTags": {
         "indoor": "door",
-        "entrance": "yes"
+        "door": "yes"
     },
     "removeTags": {
         "indoor": "door",
-        "entrance": "yes"
+        "door": "*"
     },
     "terms": [
         "doorframe",
diff --git a/data/taginfo.json b/data/taginfo.json
index e0975ce3c..b0f6a147c 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1250,6 +1250,7 @@
     {"key": "dog", "value": "yes", "description": "🄵 Dogs"},
     {"key": "dog", "value": "leashed", "description": "🄵 Dogs"},
     {"key": "dog", "value": "no", "description": "🄵 Dogs"},
+    {"key": "door", "description": "🄵 Type, 🄵 Door"},
     {"key": "drive_through", "description": "🄵 Drive-Through"},
     {"key": "duration", "description": "🄵 Duration"},
     {"key": "electrified", "value": "contact_line", "description": "🄵 Electrification"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 481fe8ffc..0f75e5b53 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2645,6 +2645,12 @@
                         "no": "Not Allowed"
                     }
                 },
+                "door_type": {
+                    "label": "Type"
+                },
+                "door": {
+                    "label": "Door"
+                },
                 "drive_through": {
                     "label": "Drive-Through"
                 },