diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9ac2d1048..e59500088 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -956,6 +956,27 @@
             "address"
         ]
     },
+    {
+        "name": "post box",
+        "match": {
+            "type": [
+                "point"
+            ],
+            "tags": {
+                "amenity": "post_box"
+            },
+            "terms": [
+                "letter drop",
+                "letterbox",
+                "mail drop",
+                "mailbox",
+                "pillar box",
+                "postbox"
+            ]
+        },
+        "icon": "post",
+        "form": []
+    },
     {
         "name": "library",
         "match": {
@@ -1561,6 +1582,19 @@
         },
         "icon": "railway-rail"
     },
+    {
+        "name": "subway entrance",
+        "match": {
+            "type": [
+                "point"
+            ],
+            "tags": {
+                "railway": "subway_entrance"
+            },
+            "terms": []
+        },
+        "icon": "rail-underground"
+    },
     {
         "name": "trunk highway",
         "match": {
diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json
new file mode 100644
index 000000000..b7a04ef11
--- /dev/null
+++ b/data/presets/presets/amenity/post_box.json
@@ -0,0 +1,22 @@
+{
+    "name": "post box",
+    "match": {
+        "type": [
+            "point"
+        ],
+        "tags": {
+            "amenity": "post_box"
+        },
+        "terms": [
+            "letter drop",
+            "letterbox",
+            "mail drop",
+            "mailbox",
+            "pillar box",
+            "postbox"
+        ]
+    },
+    "icon": "post",
+    "form": [
+    ]
+}
\ No newline at end of file
diff --git a/data/presets/presets/order.json b/data/presets/presets/order.json
index 3f5249736..6272a0588 100644
--- a/data/presets/presets/order.json
+++ b/data/presets/presets/order.json
@@ -39,6 +39,7 @@
     "amenity/pharmacy",
     "amenity/fire_station",
     "amenity/police",
+    "amenity/post_box",
     "amenity/library",
     "amenity/toilets",
     "tourism/hotel",
@@ -71,6 +72,7 @@
     "landuse/vineyard",
     "railway/rail",
     "railway/subway",
+    "railway/subway_entrance",
     "highway/trunk",
     "highway/footway",
     "highway/cycleway",
diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json
new file mode 100644
index 000000000..09d1c5901
--- /dev/null
+++ b/data/presets/presets/railway/subway_entrance.json
@@ -0,0 +1,13 @@
+{
+    "name": "subway entrance",
+    "match": {
+        "type": [
+            "point"
+        ],
+        "tags": {
+            "railway": "subway_entrance"
+        },
+        "terms": []
+    },
+    "icon": "rail-underground"
+}
\ No newline at end of file