diff --git a/data/presets.yaml b/data/presets.yaml
index e13de0430..8a3a5da72 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -434,6 +434,18 @@ en:
       fence_type:
         # fence_type=*
         label: Type
+      fire_hydrant/position:
+        # 'fire_hydrant:position=*'
+        label: Position
+        options:
+          # 'fire_hydrant:position=green'
+          green: Green
+          # 'fire_hydrant:position=lane'
+          lane: Lane
+          # 'fire_hydrant:position=parking_lot'
+          parking_lot: Parking Lot
+          # 'fire_hydrant:position=sidewalk'
+          sidewalk: Sidewalk
       fire_hydrant/type:
         # 'fire_hydrant:type=*'
         label: Type
@@ -2302,6 +2314,7 @@ en:
       emergency/fire_hydrant:
         # emergency=fire_hydrant
         name: Fire Hydrant
+        # 'terms: fire plug'
         terms: '<translate with synonyms or related terms for ''Fire Hydrant'', separated by commas>'
       emergency/no:
         # emergency=no
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 5c9b606b8..b02b1f869 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -604,6 +604,19 @@
             "type": "combo",
             "label": "Type"
         },
+        "fire_hydrant/position": {
+            "key": "fire_hydrant:position",
+            "type": "combo",
+            "label": "Position",
+            "strings": {
+                "options": {
+                    "lane": "Lane",
+                    "parking_lot": "Parking Lot",
+                    "sidewalk": "Sidewalk",
+                    "green": "Green"
+                }
+            }
+        },
         "fire_hydrant/type": {
             "key": "fire_hydrant:type",
             "type": "combo",
diff --git a/data/presets/fields/fire_hydrant/position.json b/data/presets/fields/fire_hydrant/position.json
index e279caf68..0d2e245ec 100644
--- a/data/presets/fields/fire_hydrant/position.json
+++ b/data/presets/fields/fire_hydrant/position.json
@@ -5,7 +5,7 @@
     "strings": {
         "options": {
             "lane": "Lane",
-            "parking_lot": "Parking lot",
+            "parking_lot": "Parking Lot",
             "sidewalk": "Sidewalk",
             "green": "Green"
         }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 12d0d6388..6e08a0a28 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4515,12 +4515,16 @@
         "emergency/fire_hydrant": {
             "icon": "fire-station",
             "fields": [
-                "fire_hydrant/type"
+                "fire_hydrant/type",
+                "fire_hydrant/position"
             ],
             "geometry": [
                 "point",
                 "vertex"
             ],
+            "terms": [
+                "fire plug"
+            ],
             "tags": {
                 "emergency": "fire_hydrant"
             },
diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json
index ea8d5f44d..e0a161040 100644
--- a/data/presets/presets/emergency/fire_hydrant.json
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -8,6 +8,9 @@
         "point",
         "vertex"
     ],
+    "terms": [
+        "fire plug"
+    ],
     "tags": {
         "emergency": "fire_hydrant"
     },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index cb3dabc40..9fc5c8e58 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1098,6 +1098,15 @@
                 "fence_type": {
                     "label": "Type"
                 },
+                "fire_hydrant/position": {
+                    "label": "Position",
+                    "options": {
+                        "lane": "Lane",
+                        "parking_lot": "Parking Lot",
+                        "sidewalk": "Sidewalk",
+                        "green": "Green"
+                    }
+                },
                 "fire_hydrant/type": {
                     "label": "Type",
                     "options": {
@@ -2759,7 +2768,7 @@
                 },
                 "emergency/fire_hydrant": {
                     "name": "Fire Hydrant",
-                    "terms": ""
+                    "terms": "fire plug"
                 },
                 "emergency/phone": {
                     "name": "Emergency Phone",