--- defaultpresets.xml	2018-04-15 11:17:24.734276852 +0200
+++ defaultpresets-hydrant.xml	2018-04-15 12:37:13.012947884 +0200
@@ -5583,15 +5583,74 @@
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Tag:emergency=fire_hydrant" />
             <space />
             <key key="emergency" value="fire_hydrant" />
-            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
-            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
-            <space />
-            <reference ref="name_ref" />
-            <text key="operator" text="Operator" />
-            <space />
-            <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
-            <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
-            <text key="fire_hydrant:count" text="Count" />
+            <combo key="fire_hydrant:type" text="Shape" values_searchable="true">
+                <list_entry value="pipe" short_description="A simple capped pipe, without the usual hydrant shape." />
+                <list_entry value="pillar" short_description="A pillar type hydrant." />
+                <list_entry value="wall" short_description="A wall-mounted fire hydrant." />
+                <list_entry value="underground" short_description="A fire hydrant simple outlet located underground." />
+            </combo>
+            <text key="fire_hydrant:diameter" text="Nominal diameter (in mm, inches or letters)" />
+            <combo key="fire_hydrant:pressure" text="Pressure in bar or suction" values_searchable="true">
+                <list_entry value="#" short_description="Pressure in bar." />
+                <list_entry value="yes" short_description="Pressure but value unknown." />
+                <list_entry value="suction" short_description="Hydrant is connected to a pond/stream/tank/pool, pump is needed." />
+            </combo>
+            <optional>
+                <combo key="water_source" text="Water source" default="main">
+                    <list_entry value="main" short_description="Hydrant is fed by the local distribution network." />
+                    <list_entry value="groundwater" short_description="A water well." />
+                    <list_entry value="stream" />
+                    <list_entry value="river" />
+                    <list_entry value="canal" />
+                    <list_entry value="drain" />
+                    <list_entry value="ditch" />
+                    <list_entry value="pond" />
+                    <list_entry value="lake" />
+                    <list_entry value="water_tank" />
+                    <list_entry value="swimming_pool" />
+                </combo>
+                <text key="survey:date" text="Date of last site survey" />
+                <combo key="fire_hydrant:position" text="Hydrant Position" values_context="hydrant position" >
+                    <list_entry value="lane" short_description="on the side of a road lane" />
+                    <list_entry value="parking_lot" short_description="in a parking_lot" />
+                    <list_entry value="sidewalk" short_description="on a sidewalk" />
+                    <list_entry value="green" short_description="in a grassy area" />
+                </combo>
+                <text key="water_volume" text="Volume of the water reserve." />
+                <text key="flow_rate" text="Nominal flow rate with unit of measure" />
+                <combo key="fire_hydrant:awwa_class" text="Classification per American Waterworks Association (US only)">
+                    <list_entry value="AA" />
+                    <list_entry value="A" />
+                    <list_entry value="B" />
+                    <list_entry value="C" />
+                </combo>
+                <text key="couplings" text="Number of couplings" />
+                <combo key="couplings:type" text="Coupling standard">
+                    <list_entry value="Bayonet" />
+                    <list_entry value="Barcelona" />
+                    <list_entry value="Guillemin" />
+                    <list_entry value="Klaue" />
+                    <list_entry value="Sprawny" />
+                    <list_entry value="Storz" />
+                    <list_entry value="UNI" />
+                </combo>
+                <text key="couplings:diameters" text="Each coupling diameter (separated by ;)" />
+                <combo key="pillar:type" text="Description of pillar hydrants, in addition to fire_hydrant=pillar">
+                    <list_entry value="dry_barrel" short_description="A style of pillar hydrant where the water shutoff valve is below ground." />
+                    <list_entry value="wet_barrel" short_description="A style of pillar hydrant where the barrel is pressurized at all times, with individual valves for each outlet." />
+                </combo>
+                <combo key="colour" text="Colour" values="blue,green,red,yellow,grey" default="red" />
+                <combo key="bonnet:colour" text="Colour of the top section (bonnet)" values="blue,green,red,yellow,grey" default="red" />
+                <combo key="cap:colour" text="Colour of the caps" values="blue,green,red,yellow,grey" default="red" />
+                <text key="reflective:colour" text="Colour of reflective material" />
+                <text key="manufacturer" text="Manufacturer" />
+                <text key="model" text="Model" />
+                <text key="fire_hydrant:count" text="Number of hydrants, if more than one." />
+                <text key="fire_hydrant:style" text="For special designs." />
+                <text key="ref" text="Reference number" />
+                <text key="name" text="Name" />
+                <text key="source" text="Source" />
+            </optional>
         </item> <!-- Fire Hydrant -->
         <item name="Water Tank" icon="presets/emergency/water_tank.svg" type="node,closedway" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:emergency=water_tank"