Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15138)
+++ /trunk/data/defaultpresets.xml	(revision 15139)
@@ -4735,6 +4735,10 @@
             <space />
             <key key="pipeline" value="valve" />
-            <text key="ref" text="Reference" />
-            <reference ref="operator_substance" />
+            <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" />
+            <combo key="actuator" text="Actuator" values="manual,electric_motor,pneumatic_cylinder,hydraulic_cylinder,thermostatic,solenoid" values_context="actuator" />
+            <combo key="handle" text="Handle" values="lever,wheel,cross,button" values_context="handle" />
+            <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
+            <combo key="sensor:position" values="optical,mechanical,inductive,yes" />
+            <reference ref="ref_operator" />
         </item> <!-- Pipeline Valve -->
         <separator/>
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 15138)
+++ /trunk/data/validator/combinations.mapcss	(revision 15139)
@@ -118,4 +118,5 @@
 
 /* {0.tag} without {1.key} (warning level) */
+node[actuator=manual][!handle],
 node[emergency=fire_hydrant][!fire_hydrant:type],
 way[     boundary=administrative][!admin_level],