Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18090)
+++ trunk/resources/data/defaultpresets.xml	(revision 18091)
@@ -377,9 +377,4 @@
     <chunk id="power_loc">
         <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
-    </chunk>
-    <chunk id="power_extra">
-        <reference ref="power_loc" />
-        <reference ref="voltage_frequency" />
-        <reference ref="ref_operator" />
     </chunk>
     <chunk id="power_line_extra">
@@ -2036,5 +2031,5 @@
             <key key="substance" value="water" />
             <key key="usage" value="penstock" />
-            <combo key="location" text="Location" values="overground,underground" values_context="pipeline" />
+            <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
             <optional>
                 <reference ref="name_operator" />
@@ -5841,5 +5836,5 @@
             <reference ref="name_ref" />
             <reference ref="operator_substance" />
-            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
+            <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
             <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
             <text key="pressure" text="Pressure (bar)" />
@@ -5874,5 +5869,5 @@
                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
                 <reference ref="color" />
-                <combo key="location" text="Location" values="underground,overground" values_context="pipeline" />
+                <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
             </optional>
         </item> <!-- Marker -->
@@ -5969,5 +5964,5 @@
             <optional>
                <combo key="bunker_type" text="Type" values="command,foxhole,gun_emplacement,hardened_aircraft_shelter,mg_nest,munitions,observation,personnel_shelter,pillbox,technical,tobruk" values_context="bunker" values_searchable="true" />
-               <combo key="location" text="Location" values="overground,underground" values_context="bunker" />
+               <combo key="location" text="Location" values="overground,underground,underwater" values_context="bunker" />
                <combo key="building" text="Building" values="bunker,yes" values_context="building" />
                <text key="name" text="Name" />
@@ -6168,5 +6163,7 @@
             <text key="name" text="Name" />
             <combo key="substation" text="Type of substation" values="compensation,converter,distribution,industrial,minor_distribution,traction,transition,transmission" values_context="power" />
-            <reference ref="power_extra" />
+            <reference ref="power_loc" />
+            <reference ref="voltage_frequency" />
+            <reference ref="ref_operator" />
             <optional>
                 <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
@@ -6378,5 +6375,5 @@
             <optional>
                 <reference ref="cables_circuits" />
-                <combo key="location" text="Location" values="underground,underwater,overground" values_context="power cable" />
+                <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="power cable" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
                 <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />