Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10319)
+++ /trunk/data/defaultpresets.xml	(revision 10320)
@@ -231,4 +231,6 @@
     </chunk>
     <chunk id="route_hikebike_optionals">
+        <text key="ref" text="Reference" />
+        <text key="operator" text="Operator" />
         <text key="distance" text="Distance (km)"/>
         <text key="ascent" text="Ascent (m)"/>
@@ -9856,6 +9858,6 @@
                 <key key="type" value="route"/>
                 <key key="route" value="bicycle"/>
-                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue!" />
-                <reference ref="name_ref_operator"/>
+                <text key="name" text="Name" />
+                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -9880,5 +9882,5 @@
                 <key key="type" value="route"/>
                 <key key="route" value="mtb"/>
-                <reference ref="name_ref_operator"/>
+                <text key="name" text="Name" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -9903,6 +9905,6 @@
                 <key key="type" value="route"/>
                 <key key="route" value="hiking"/>
-                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue!" />
-                <reference ref="name_ref_operator"/>
+                <text key="name" text="Name" />
+                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -9919,6 +9921,6 @@
                 <key key="type" value="route"/>
                 <key key="route" value="foot"/>
-                <combo key="network" text="Network" values="rwn,lwn" match="keyvalue!" />
-                <reference ref="name_ref_operator"/>
+                <text key="name" text="Name" />
+                <combo key="network" text="Network" values="rwn,lwn" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -9935,6 +9937,6 @@
                 <key key="type" value="route"/>
                 <key key="route" value="horse"/>
-                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" match="keyvalue!" />
-                <reference ref="name_ref_operator"/>
+                <text key="name" text="Name" />
+                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -9953,6 +9955,6 @@
                 <key key="type" value="route"/>
                 <key key="route" value="piste"/>
-                <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue!" />
-                <reference ref="name_ref_operator"/>
+                <text key="name" text="Name" />
+                <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -9973,7 +9975,7 @@
                 <space/>
                 <key key="type" value="route"/>
-                <key key="route" value="piste"/>
-                <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue!" />
-                <reference ref="name_ref_operator"/>
+                <key key="route" value="ski"/>
+                <text key="name" text="Name" />
+                <combo key="piste:type" text="Piste type" values="nordic,alpine" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -9996,6 +9998,7 @@
                 <key key="type" value="route"/>
                 <key key="route" value="detour"/>
-                <reference ref="name_ref_operator"/>
+                <reference ref="name_ref"/>
                 <optional>
+                    <text key="operator" text="Operator" />
                     <text key="destination" text="Destination"/>
                     <text key="detour" text="Ref of the way this is a detour to"/>
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 10319)
+++ /trunk/data/validator/combinations.mapcss	(revision 10320)
@@ -118,4 +118,10 @@
 
 /* {0.tag} without {1.key} (warning level) */
+relation[route=bicycle][!network][type=route],
+relation[route=hiking][!network][type=route],
+relation[route=foot][!network][type=route],
+relation[route=horse][!network][type=route],
+relation[route=piste][!piste:type][type=route],
+relation[route=ski][!piste:type][type=route],
 *[tourism=information][!information],
 *[aeroway=terminal][!building],
