Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3615)
+++ trunk/data/defaultpresets.xml	(revision 3616)
@@ -2880,6 +2880,6 @@
             <key key="man_made" value="pipeline" />
             <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="type" text="Type" values="water,gas,heat,oil,sewage,any substance" default="" delete_if_empty="true" />
-            <combo key="location" text="Location" values="underground,underwater,overground" default="" delete_if_empty="true" />
+            <combo key="type" text="Type" values="water,gas,heat,oil,sewage" default="" delete_if_empty="true" />
+            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" default="" delete_if_empty="true" />
         </item>
         <item name="Crane" icon="presets/crane.png" type="node,closedway">