diff --git a/data/presets.yaml b/data/presets.yaml
index f688c2572..d55ae922e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -598,30 +598,36 @@ en:
       fence_type:
         # fence_type=*
         label: Type
+      fire_hydrant/diameter:
+        # 'fire_hydrant:diameter=*'
+        label: 'Nominal diameter (in mm, inches or letters).'
       fire_hydrant/position:
         # 'fire_hydrant:position=*'
         label: Position
         options:
           # 'fire_hydrant:position=green'
-          green: Green
+          green: in a grassy area
           # 'fire_hydrant:position=lane'
-          lane: Lane
+          lane: on the side of a road lane
           # 'fire_hydrant:position=parking_lot'
-          parking_lot: Parking Lot
+          parking_lot: in a parking_lot
           # 'fire_hydrant:position=sidewalk'
-          sidewalk: Sidewalk
+          sidewalk: on a sidewalk
+      fire_hydrant/pressure:
+        # 'fire_hydrant:pressure=*'
+        label: Pressure in bar or suction
       fire_hydrant/type:
         # 'fire_hydrant:type=*'
-        label: Type
+        label: The shape of the hydrant.
         options:
           # 'fire_hydrant:type=pillar'
-          pillar: Pillar/Aboveground
-          # 'fire_hydrant:type=pond'
-          pond: Pond
+          pillar: A pillar type hydrant.
+          # 'fire_hydrant:type=pipe'
+          pipe: 'A simple capped pipe, without the usual hydrant shape.'
           # 'fire_hydrant:type=underground'
-          underground: Underground
+          underground: A fire hydrant simple outlet located underground.
           # 'fire_hydrant:type=wall'
-          wall: Wall
+          wall: A wall-mounted fire hydrant.
       fireplace:
         # fireplace=*
         label: Fireplace
@@ -1791,6 +1797,9 @@ en:
       surveillance/zone:
         # 'surveillance:zone=*'
         label: Surveillance Zone
+      survey/date:
+        # 'survey:date=*'
+        label: Date of last site survey (YYYY-MM-DD)
       swimming_pool:
         # swimming_pool=*
         label: Type
@@ -2020,6 +2029,12 @@ en:
       water_point:
         # water_point=*
         label: Water Point
+      water_source:
+        # water_source=*
+        label: Water source
+      water_volume:
+        # water_volume=*
+        label: Volume of the water reserve. Tanks and pools only (default in m^3).
       waterway:
         # waterway=*
         label: Type
@@ -3643,7 +3658,7 @@ en:
       emergency/fire_hydrant:
         # emergency=fire_hydrant
         name: Fire Hydrant
-        # 'terms: fire plug'
+        # 'terms: fire plug,fire water well'
         terms: '<translate with synonyms or related terms for ''Fire Hydrant'', separated by commas>'
       emergency/first_aid_kit:
         # emergency=first_aid_kit
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 7fa4892ee..b37fa8fec 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -104,8 +104,10 @@
     "fax": {"key": "fax", "type": "tel", "label": "Fax", "universal": true, "placeholder": "+31 42 123 4567"},
     "fee": {"key": "fee", "type": "check", "label": "Fee"},
     "fence_type": {"key": "fence_type", "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", "label": "Type", "strings": {"options": {"pillar": "Pillar/Aboveground", "underground": "Underground", "wall": "Wall", "pond": "Pond"}}},
+    "fire_hydrant/diameter": {"key": "fire_hydrant:diameter", "type": "text", "label": "Nominal diameter (in mm, inches or letters)."},
+    "fire_hydrant/position": {"key": "fire_hydrant:position", "type": "combo", "label": "Position", "strings": {"options": {"lane": "on the side of a road lane", "parking_lot": "in a parking_lot", "sidewalk": "on a sidewalk", "green": "in a grassy area"}}},
+    "fire_hydrant/pressure": {"key": "fire_hydrant:pressure", "type": "combo", "label": "Pressure in bar or suction", "options": ["#", "yes", "suction"]},
+    "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "The shape of the hydrant.", "strings": {"options": {"pillar": "A pillar type hydrant.", "underground": "A fire hydrant simple outlet located underground.", "wall": "A wall-mounted fire hydrant.", "pipe": "A simple capped pipe, without the usual hydrant shape."}}},
     "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
     "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
     "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true},
@@ -306,6 +308,7 @@
     "surveillance": {"key": "surveillance", "type": "combo", "label": "Surveillance Kind"},
     "surveillance/type": {"key": "surveillance:type", "type": "combo", "label": "Surveillance Type", "strings": {"options": {"camera": "Camera", "guard": "Guard", "ALPR": "Automatic License Plate Reader"}}},
     "surveillance/zone": {"key": "surveillance:zone", "type": "combo", "label": "Surveillance Zone"},
+    "survey/date": {"key": "survey:date", "type": "text", "universal": true, "label": "Date of last site survey (YYYY-MM-DD)"},
     "swimming_pool": {"key": "swimming_pool", "type": "combo", "label": "Type"},
     "switch": {"key": "switch", "type": "combo", "label": "Type", "strings": {"options": {"mechanical": "Mechanical", "circuit_breaker": "Circuit Breaker", "disconnector": "Disconnector", "earthing": "Earthing"}}},
     "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
@@ -340,6 +343,8 @@
     "voltage/tertiary": {"key": "voltage:tertiary", "type": "combo", "label": "Tertiary Voltage"},
     "wall": {"key": "wall", "type": "combo", "label": "Type"},
     "water_point": {"key": "water_point", "type": "check", "label": "Water Point"},
+    "water_source": {"key": "water_source", "default": "main", "type": "combo", "label": "Water source", "options": ["main", "groundwater", "stream", "river", "canal", "drain", "ditch", "pond", "lake", "water_tank", "swimming_pool"]},
+    "water_volume": {"key": "water_volume", "type": "number", "label": "Volume of the water reserve. Tanks and pools only (default in m^3)."},
     "water": {"key": "water", "type": "combo", "label": "Type"},
     "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
     "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "http://example.com/", "universal": true, "label": "Website"},
diff --git a/data/presets/fields/fire_hydrant/diameter.json b/data/presets/fields/fire_hydrant/diameter.json
new file mode 100644
index 000000000..50ffc101e
--- /dev/null
+++ b/data/presets/fields/fire_hydrant/diameter.json
@@ -0,0 +1,5 @@
+{
+    "key": "fire_hydrant:diameter",
+    "type": "text",
+    "label": "Nominal diameter (in mm, inches or letters)."
+}
diff --git a/data/presets/fields/fire_hydrant/position.json b/data/presets/fields/fire_hydrant/position.json
index 0d2e245ec..6c0e3406b 100644
--- a/data/presets/fields/fire_hydrant/position.json
+++ b/data/presets/fields/fire_hydrant/position.json
@@ -4,10 +4,10 @@
     "label": "Position",
     "strings": {
         "options": {
-            "lane": "Lane",
-            "parking_lot": "Parking Lot",
-            "sidewalk": "Sidewalk",
-            "green": "Green"
+            "lane": "on the side of a road lane",
+            "parking_lot": "in a parking_lot",
+            "sidewalk": "on a sidewalk",
+            "green": "in a grassy area"
         }
     }
 }
diff --git a/data/presets/fields/fire_hydrant/pressure.json b/data/presets/fields/fire_hydrant/pressure.json
new file mode 100644
index 000000000..78a4b50b6
--- /dev/null
+++ b/data/presets/fields/fire_hydrant/pressure.json
@@ -0,0 +1,6 @@
+{
+    "key": "fire_hydrant:pressure",
+    "type": "combo",
+    "label": "Pressure in bar or suction",
+    "options": [ "#", "yes", "suction" ]
+}
diff --git a/data/presets/fields/fire_hydrant/type.json b/data/presets/fields/fire_hydrant/type.json
index 13f5e6cde..0e3dbae1a 100644
--- a/data/presets/fields/fire_hydrant/type.json
+++ b/data/presets/fields/fire_hydrant/type.json
@@ -1,13 +1,13 @@
 {
     "key": "fire_hydrant:type",
     "type": "combo",
-    "label": "Type",
+    "label": "The shape of the hydrant.",
     "strings": {
         "options": {
-            "pillar": "Pillar/Aboveground",
-            "underground": "Underground",
-            "wall": "Wall",
-            "pond": "Pond"
+            "pillar": "A pillar type hydrant.",
+            "underground": "A fire hydrant simple outlet located underground.",
+            "wall": "A wall-mounted fire hydrant.",
+            "pipe": "A simple capped pipe, without the usual hydrant shape."
         }
     }
 }
diff --git a/data/presets/fields/survey/date.json b/data/presets/fields/survey/date.json
new file mode 100644
index 000000000..58873b995
--- /dev/null
+++ b/data/presets/fields/survey/date.json
@@ -0,0 +1,6 @@
+{
+    "key": "survey:date",
+    "type": "text",
+    "universal": true,
+    "label": "Date of last site survey (YYYY-MM-DD)"
+}
diff --git a/data/presets/fields/water_source.json b/data/presets/fields/water_source.json
new file mode 100644
index 000000000..91ab2ab97
--- /dev/null
+++ b/data/presets/fields/water_source.json
@@ -0,0 +1,7 @@
+{
+    "key": "water_source",
+    "default": "main",
+    "type": "combo",
+    "label": "Water source",
+    "options": [ "main", "groundwater", "stream", "river", "canal", "drain", "ditch", "pond", "lake", "water_tank", "swimming_pool" ]
+}
diff --git a/data/presets/fields/water_volume.json b/data/presets/fields/water_volume.json
new file mode 100644
index 000000000..5d5f51bc5
--- /dev/null
+++ b/data/presets/fields/water_volume.json
@@ -0,0 +1,5 @@
+{
+    "key": "water_volume",
+    "type": "number",
+    "label": "Volume of the water reserve. Tanks and pools only (default in m^3)."
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index a942a9075..9ce393108 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -361,7 +361,7 @@
     "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
     "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
     "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
-    "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/position", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["fire plug"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
+    "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/pressure", "fire_hydrant/diameter", "water_source", "survey/date", "fire_hydrant/position", "water_volume", "colour", "ref", "name"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
     "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"},
     "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"},
     "emergency/lifeguard": {"icon": "fas-life-ring", "fields": ["ref", "operator", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["CPR", "rescue"], "tags": {"emergency": "lifeguard"}, "name": "Lifeguard"},
diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json
index 1cdc55205..745791474 100644
--- a/data/presets/presets/emergency/fire_hydrant.json
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -2,16 +2,23 @@
     "icon": "temaki-fire_hydrant",
     "fields": [
         "fire_hydrant/type",
+        "fire_hydrant/pressure",
+        "fire_hydrant/diameter",
+        "water_source",
+        "survey/date",
         "fire_hydrant/position",
+        "water_volume",
+        "colour",
         "ref",
-        "operator"
+        "name"             
     ],
     "geometry": [
         "point",
         "vertex"
     ],
     "terms": [
-        "fire plug"
+        "fire plug",
+        "fire water well"
     ],
     "tags": {
         "emergency": "fire_hydrant"
diff --git a/data/taginfo.json b/data/taginfo.json
index c15770ca4..e93aa7abd 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -7227,6 +7227,10 @@
     {"key": "fax", "description": "🄵 Fax"},
     {"key": "fee", "description": "🄵 Fee"},
     {"key": "fence_type", "description": "🄵 Type"},
+    {
+      "key": "fire_hydrant:diameter",
+      "description": "🄵 Nominal diameter (in mm, inches or letters)."
+    },
     {
       "key": "fire_hydrant:position",
       "value": "lane",
@@ -7247,14 +7251,30 @@
       "value": "green",
       "description": "🄵 Position"
     },
-    {"key": "fire_hydrant:type", "value": "pillar", "description": "🄵 Type"},
+    {
+      "key": "fire_hydrant:pressure",
+      "description": "🄵 Pressure in bar or suction"
+    },
+    {
+      "key": "fire_hydrant:type",
+      "value": "pillar",
+      "description": "🄵 The shape of the hydrant."
+    },
     {
       "key": "fire_hydrant:type",
       "value": "underground",
-      "description": "🄵 Type"
+      "description": "🄵 The shape of the hydrant."
+    },
+    {
+      "key": "fire_hydrant:type",
+      "value": "wall",
+      "description": "🄵 The shape of the hydrant."
+    },
+    {
+      "key": "fire_hydrant:type",
+      "value": "pipe",
+      "description": "🄵 The shape of the hydrant."
     },
-    {"key": "fire_hydrant:type", "value": "wall", "description": "🄵 Type"},
-    {"key": "fire_hydrant:type", "value": "pond", "description": "🄵 Type"},
     {"key": "fireplace", "description": "🄵 Fireplace"},
     {"key": "fitness_station", "description": "🄵 Equipment Type"},
     {"key": "fixme", "description": "🄵 Fix Me"},
@@ -7923,6 +7943,10 @@
       "description": "🄵 Surveillance Type"
     },
     {"key": "surveillance:zone", "description": "🄵 Surveillance Zone"},
+    {
+      "key": "survey:date",
+      "description": "🄵 Date of last site survey (YYYY-MM-DD)"
+    },
     {"key": "swimming_pool", "description": "🄵 Type"},
     {"key": "switch", "value": "mechanical", "description": "🄵 Type"},
     {"key": "switch", "value": "circuit_breaker", "description": "🄵 Type"},
@@ -8080,6 +8104,11 @@
     {"key": "voltage:tertiary", "description": "🄵 Tertiary Voltage"},
     {"key": "wall", "description": "🄵 Type"},
     {"key": "water_point", "description": "🄵 Water Point"},
+    {"key": "water_source", "description": "🄵 Water source"},
+    {
+      "key": "water_volume",
+      "description": "🄵 Volume of the water reserve. Tanks and pools only (default in m^3)."
+    },
     {"key": "water", "description": "🄵 Type"},
     {"key": "website", "description": "🄵 Website"},
     {"key": "wetland", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c4ae1b817..72393f9a4 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2002,22 +2002,28 @@
                 "fence_type": {
                     "label": "Type"
                 },
+                "fire_hydrant/diameter": {
+                    "label": "Nominal diameter (in mm, inches or letters)."
+                },
                 "fire_hydrant/position": {
                     "label": "Position",
                     "options": {
-                        "lane": "Lane",
-                        "parking_lot": "Parking Lot",
-                        "sidewalk": "Sidewalk",
-                        "green": "Green"
+                        "lane": "on the side of a road lane",
+                        "parking_lot": "in a parking_lot",
+                        "sidewalk": "on a sidewalk",
+                        "green": "in a grassy area"
                     }
                 },
+                "fire_hydrant/pressure": {
+                    "label": "Pressure in bar or suction"
+                },
                 "fire_hydrant/type": {
-                    "label": "Type",
+                    "label": "The shape of the hydrant.",
                     "options": {
-                        "pillar": "Pillar/Aboveground",
-                        "underground": "Underground",
-                        "wall": "Wall",
-                        "pond": "Pond"
+                        "pillar": "A pillar type hydrant.",
+                        "underground": "A fire hydrant simple outlet located underground.",
+                        "wall": "A wall-mounted fire hydrant.",
+                        "pipe": "A simple capped pipe, without the usual hydrant shape."
                     }
                 },
                 "fireplace": {
@@ -2977,6 +2983,9 @@
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "survey/date": {
+                    "label": "Date of last site survey (YYYY-MM-DD)"
+                },
                 "swimming_pool": {
                     "label": "Type"
                 },
@@ -3159,6 +3168,12 @@
                 "water_point": {
                     "label": "Water Point"
                 },
+                "water_source": {
+                    "label": "Water source"
+                },
+                "water_volume": {
+                    "label": "Volume of the water reserve. Tanks and pools only (default in m^3)."
+                },
                 "water": {
                     "label": "Type"
                 },
@@ -4651,7 +4666,7 @@
                 },
                 "emergency/fire_hydrant": {
                     "name": "Fire Hydrant",
-                    "terms": "fire plug"
+                    "terms": "fire plug,fire water well"
                 },
                 "emergency/first_aid_kit": {
                     "name": "First Aid Kit",