Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 11152)
+++ /trunk/data/defaultpresets.xml	(revision 11153)
@@ -30,5 +30,5 @@
     </chunk>
     <chunk id="riding_surface">
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+        <combo key="leisure" text="Type" values="horse_riding,pitch,sports_centre,stadium,track" values_context="riding" />
         <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
     </chunk>
@@ -9974,5 +9974,5 @@
                 <key key="route" value="bicycle"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" />
+                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" display_values="international,national,regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -10021,5 +10021,5 @@
                 <key key="route" value="hiking"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" />
+                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" display_values="international,national,regional,local" values_sort="false"/>
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -10037,5 +10037,5 @@
                 <key key="route" value="foot"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="rwn,lwn" />
+                <combo key="network" text="Network" values="rwn,lwn" display_values="regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
@@ -10053,5 +10053,5 @@
                 <key key="route" value="horse"/>
                 <text key="name" text="Name" />
-                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" />
+                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" display_values="international,national,regional,local" values_sort="false" />
                 <optional>
                     <reference ref="route_hikebike_optionals" />
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 11152)
+++ /trunk/data/validator/combinations.mapcss	(revision 11153)
@@ -129,4 +129,5 @@
 relation[route=ski][!piste:type][type=route],
 *[tourism=information][!information],
+*[leisure=pitch][!sport],
 *[aeroway=terminal][!building],
 *[power=generator][!generator:source],
Index: /trunk/data/validator/unnecessary.mapcss
===================================================================
--- /trunk/data/validator/unnecessary.mapcss	(revision 11152)
+++ /trunk/data/validator/unnecessary.mapcss	(revision 11153)
@@ -7,4 +7,5 @@
   /* see #9365 - Useless tag layer=0 */
   throwWarning: tr("{0} is unnecessary", "{0.tag}");
+  group: tr("unnecessary tag");
   fixRemove: "{0.key}";
   assertMatch: "way layer=0";
@@ -20,4 +21,5 @@
 area:closed[shop    ][area?] {
   throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}");
+  group: tr("unnecessary tag");
   fixRemove: "{2.key}";
 }
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 11152)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 11153)
@@ -3707,6 +3707,4 @@
 area[sport="9pin"],
 area[sport="10pin"],
-area[sport=athletics],
-area[sport=running],
 area[sport=soccer],
 area[sport=australian_football],
@@ -3724,12 +3722,4 @@
 node[sport="10pin"] {
     icon-image: "presets/sport/10pin.svg";
-    set icon_z17;
-}
-node[sport=athletics] {
-    icon-image: "presets/sport/athletics.svg";
-    set icon_z17;
-}
-node[sport=running] {
-    icon-image: "presets/sport/running.svg";
     set icon_z17;
 }
@@ -3854,5 +3844,25 @@
     set icon_z17;
 }
-area[sport=multi],
+area[sport=athletics] {
+    fill-color: sport_athletics#cfebd7;
+}
+node[sport=athletics] {
+    icon-image: "presets/sport/athletics.svg";
+    set icon_z17;
+}
+area[sport=running] {
+    fill-color: sport_running#cfebd8;
+}
+node[sport=running] {
+    icon-image: "presets/sport/running.svg";
+    set icon_z17;
+}
+area[sport=multi] {
+    fill-color: sport_multi#cfebd9;
+}
+node[sport=multi] {
+    icon-image: "presets/sport/multi.svg";
+    set icon_z17;
+}
 area[sport=pelota],
 area[sport=racquet],
@@ -3861,8 +3871,4 @@
 area[sport=skateboard] {
     fill-color: sport#bde3cb;
-}
-node[sport=multi] {
-    icon-image: "presets/sport/multi.svg";
-    set icon_z17;
 }
 node[sport=pelota] {