Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml     (revision 8335)
+++ data/defaultpresets.xml     (working copy)
@@ -178,6 +178,9 @@
     <chunk id="sport">
             <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,handball,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,running,shooting,skateboard,skating,soccer,swimming,table_tennis,tennis" values_context="sport" />
     </chunk>
+    <chunk id="volume_capacity">
+        <combo key="capacity" text="Capacity" values="0.25 m³,50 m³,475 m³,2000 m³,15000 m³" />
+    </chunk>
     <chunk id="fee">
         <combo key="fee" text="Fee" values="yes,no" />
     </chunk>
@@ -4596,7 +4599,7 @@
             <space />
             <key key="amenity" value="bench" />
             <check key="backrest" text="Backrest" />
-            <combo key="material" text="Material" values="stone,metal,wood,plastic" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
@@ -5307,9 +5310,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=storage_tank" />
             <key key="man_made" value="storage_tank" />
             <combo key="building" text="Building" values="storage_tank" values_context="building" />
-            <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
-            <text key="operator" text="Operator" />
-            <text key="height" text="Height (meters)" length="7" />
+            <optional>
+                <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
+                <reference ref="volume_capacity" />
+                <text key="operator" text="Operator" />
+                <text key="height" text="Height (meters)" length="7" />
+                <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            </optional>
         </item> <!-- Storage Tank -->
         <item name="Bunker Silo" icon="styles/standard/bunker_silo.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bunker_silo"
@@ -5391,7 +5398,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_tower" />
             <space />
             <key key="man_made" value="water_tower" />
-            <text key="name" text="Name" />
+            <optional>
+                <text key="name" text="Name" />
+                <reference ref="volume_capacity" />
+                <text key="operator" text="Operator" />
+                <text key="height" text="Height (meters)" length="7" />
+            </optional>
         </item> <!-- Water Tower -->
         <item name="Water Works" icon="presets/water_works.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"