Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 18404)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -25,7 +25,6 @@
         <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,acrylic,grass,sand,tartan,ground" />
     </chunk>
     <chunk id="riding_surface">
-        <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>
     <chunk id="highway_base">
@@ -232,9 +231,16 @@
             <text key="operator" text="Operator" />
         </optional>
     </chunk>
+    <chunk id="sport_leisure_values">
+        <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+        <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+        <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium" />
+    </chunk>
     <chunk id="name_leisure_pitch">
         <text key="name" text="Name" />
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+        <combo key="leisure" text="Type" default="pitch">
+            <reference ref="sport_leisure_values" />
+        </combo>
     </chunk>
     <chunk id="sport">
         <multiselect key="sport" text="Sport" values="10pin;9pin;american_football;archery;athletics;australian_football;baseball;basketball;beachvolleyball;billiards;boules;bowls;canadian_football;canoe;chess;climbing;cricket;croquet;curling;cycling;dog_racing;equestrian;field_hockey;fitness;gaelic_games;golf;gymnastics;handball;horse_racing;ice_hockey;ice_skating;karting;model_aerodrome;motocross;motor;multi;pelota;racquet;rc_car;roller_skating;rowing;rugby_league;rugby_union;running;safety_training;scuba_diving;shooting;skateboard;soccer;surfing;swimming;table_tennis;tennis;volleyball" values_context="sport" />
@@ -3944,7 +3950,7 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Public bath" text="Similar but different tags:" />
-            <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
+            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
         </item> <!-- Water Park -->
         <item name="Water Slide" icon="presets/attraction/water_slide.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:attraction=water_slide" />
@@ -3968,7 +3974,7 @@
             <reference ref="fee" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Water Park" text="Similar but different tags:" />
-            <preset_link preset_name="Sports Centre" text="Similar but different tags:" />
+            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
         </item> <!-- Public bath -->
         <item name="Resort" icon="presets/leisure/resort.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=resort" />
@@ -5095,7 +5101,7 @@
             <reference ref="sport" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Stadium -->
-        <item name="Sports Centre" icon="presets/sport/sports_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Sports Center" icon="presets/sport/sports_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=sports_centre" />
             <space />
             <key key="leisure" value="sports_centre" />
@@ -5103,8 +5109,8 @@
             <reference ref="sport" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
-        </item> <!-- Sports Centre -->
-        <item name="Fitness Centre" icon="presets/sport/fitness_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        </item> <!-- Sports Center -->
+        <item name="Fitness Center" icon="presets/sport/fitness_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=fitness_centre" />
             <space />
             <key key="leisure" value="fitness_centre" />
@@ -5112,7 +5118,7 @@
             <reference ref="sport" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
-        </item> <!-- Fitness Centre -->
+        </item> <!-- Fitness Center -->
         <item name="Pitch" icon="presets/sport/pitch.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=pitch" />
             <space />
@@ -5132,12 +5138,12 @@
             <check key="area" text="Area" />
         </item> <!-- Racetrack -->
         <group name="Golf" icon="presets/sport/golf/golf.svg">
-                <item name="Golf Course" icon="presets/sport/golf/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
-                    <link wiki="Tag:leisure=golf_course" />
-                    <space />
-                    <key key="leisure" value="golf_course" />
-                    <reference ref="name_oh_wheelchair" />
-                </item> <!-- Golf Course -->
+            <item name="Golf Course" icon="presets/sport/golf/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:leisure=golf_course" />
+                <space />
+                <key key="leisure" value="golf_course" />
+                <reference ref="name_oh_wheelchair" />
+            </item> <!-- Golf Course -->
             <separator/>
             <item name="Tee" name_context="golf" icon="presets/sport/golf/tee.svg" type="node,closedway" preset_name_label="true">
                 <link wiki="Tag:leisure=golf_course" />
@@ -5168,13 +5174,13 @@
                 <key key="golf" value="bunker" />
                 <combo key="natural" text="Natural" text_context="golf" values="sand" default="sand" />
             </item> <!-- Bunker -->
-             <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
+            <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
                 <link wiki="Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="water_hazard" />
                 <key key="natural" value="water" match="keyvalue" />
             </item> <!-- Frontal Water hazard -->
-             <item name="Lateral water hazard" name_context="golf" icon="presets/sport/golf/lateral_water_hazard.svg" type="closedway" preset_name_label="true">
+            <item name="Lateral water hazard" name_context="golf" icon="presets/sport/golf/lateral_water_hazard.svg" type="closedway" preset_name_label="true">
                 <link wiki="Tag:leisure=golf_course" />
                 <space />
                 <key key="golf" value="lateral_water_hazard" />
@@ -5217,7 +5223,11 @@
             <space />
             <key key="sport" value="multi" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium,track" values_context="running" />
+            <combo key="leisure" text="Type" values_context="running">
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+                 <list_entry value="fitness_centre" display_value="Fitness Center" icon="presets/sport/fitness_centre.svg" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Multi -->
         <item name="Nine-pin Bowling" icon="presets/sport/9pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5225,7 +5235,9 @@
             <space />
             <key key="sport" value="9pin" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
             <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
         </item> <!-- Nine-pin Bowling -->
         <item name="Ten-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5233,7 +5245,9 @@
             <space />
             <key key="sport" value="10pin" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
             <combo key="surface" text="Surface" values="clay,concrete,ground,wood" />
         </item> <!-- Ten-pin Bowling -->
         <item name="Archery" icon="presets/sport/archery.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5241,14 +5255,19 @@
             <space />
             <key key="sport" value="archery" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Archery -->
         <item name="Track and Field Athletics" icon="presets/sport/athletics.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sports=athletics" />
             <space />
             <key key="sport" value="athletics" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
+            <combo key="leisure" text="Type" values_context="running" default="track">
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Track and Field Athletics -->
         <item name="Running" icon="presets/sport/running.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5256,7 +5275,10 @@
             <space />
             <key key="sport" value="running" />
             <reference ref="name_operator" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
+            <combo key="leisure" text="Type" values_context="running">
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Running -->
         <item name="Climbing site" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
@@ -5264,7 +5286,9 @@
             <space />
             <key key="sport" value="climbing" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="sports_centre" />
+            <combo key="leisure" text="Type">
+                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+            </combo>
             <reference ref="climbing_styles" />
             <text key="climbing:routes" text="Number of routes" />
             <text key="ele" text="Usual elevation at the bottom of the routes" length="10" />
@@ -5320,7 +5344,10 @@
             <space />
             <key key="sport" value="cycling" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
+            <combo key="leisure" text="Type" values_context="racing">
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Cycling -->
         <item name="Dog Racing" icon="presets/sport/dog_racing.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5328,7 +5355,10 @@
             <space />
             <key key="sport" value="dog_racing" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
+            <combo key="leisure" text="Type" values_context="racing">
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Dog Racing -->
         <item name="Equestrian" icon="presets/sport/equestrian.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5336,6 +5366,11 @@
             <space />
             <key key="sport" value="equestrian" />
             <text key="name" text="Name" />
+            <combo key="leisure" text="Type" values_context="riding">
+                 <list_entry value="horse_riding" display_value="Horse Riding" icon="presets/leisure/horse_riding.svg" />
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
         <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5343,6 +5378,11 @@
             <space />
             <key key="sport" value="horse_racing" />
             <text key="name" text="Name" />
+            <combo key="leisure" text="Type" values_context="riding">
+                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+                 <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <reference ref="riding_surface" />
         </item> <!-- Horse Racing -->
         <item name="Gymnastics" icon="presets/sport/gymnastics.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5350,21 +5390,29 @@
             <space />
             <key key="sport" value="gymnastics" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium" />
+            <combo key="leisure" text="Type" >
+                 <list_entry value="fitness_centre" display_value="Fitness Center" icon="presets/sport/fitness_centre.svg" />
+                 <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Gymnastics -->
         <item name="Ice Skating" icon="presets/sport/ice_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=ice_skating" />
             <space />
             <key key="sport" value="ice_skating" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
+            <combo key="leisure" text="Type" default="ice_rink">
+                 <list_entry value="ice_rink" display_value="Ice rink" />
+                 <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Ice Skating -->
         <item name="Roller Skating" icon="presets/sport/roller_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=roller_skating"/>
             <space />
             <key key="sport" value="roller_skating" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete" />
         </item> <!-- Roller Skating -->
         <item name="Skateboard" icon="presets/sport/skateboard.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5372,7 +5420,10 @@
             <space />
             <key key="sport" value="skateboard" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
+            <combo key="leisure" text="Type" default="pitch" values_context="racing">
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete" />
         </item> <!-- Skateboard -->
         <item name="Swimming" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5380,7 +5431,12 @@
             <space />
             <key key="sport" value="swimming" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
+            <combo key="leisure" text="Type" default="swimming_pool" values_searchable="true">
+                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+                 <list_entry value="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
+                 <list_entry value="swimming_pool" display_value="Swimming Pool" icon="presets/sport/swimming.svg" />
+                 <list_entry value="water_park" display_value="Water Park" icon="presets/leisure/water_park.svg" />
+            </combo>
         </item> <!-- Swimming -->
         <item name="Scuba Diving" icon="presets/sport/scuba_diving.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=scuba_diving" />
@@ -5403,14 +5459,19 @@
             <space />
             <key key="sport" value="shooting" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Shooting -->
         <item name="Chess" icon="presets/sport/chess.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=chess" />
             <space />
             <key key="sport" value="chess" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,picnic_table" />
+            <combo key="leisure" text="Type">
+                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                 <list_entry value="picnic_table" display_value="Picnic Table" icon="presets/leisure/picnic.svg" />
+            </combo>
         </item> <!-- Chess -->
     </group> <!-- Sport -->
     <group name="Sport (Ball)" icon="presets/sport/soccer.svg">
@@ -5490,7 +5551,9 @@
             <space />
             <key key="sport" value="handball" />
             <reference ref="name_operator" />
-            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Handball -->
         <item name="Volleyball" icon="presets/sport/volleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5498,7 +5561,9 @@
             <space />
             <key key="sport" value="volleyball" />
             <reference ref="name_operator" />
-            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Volleyball -->
         <item name="Beach Volleyball" icon="presets/sport/beachvolleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5506,21 +5571,28 @@
             <space />
             <key key="sport" value="beachvolleyball" />
             <reference ref="name_operator" />
-            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
+            <combo key="leisure" text="Type">
+                <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Beach Volleyball -->
         <item name="Billiards" icon="presets/sport/billiards.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=billiards" />
             <space />
             <key key="sport" value="billiards" />
             <reference ref="name_operator" />
-            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
+            <combo key="leisure" text="Type">
+                <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Billiards -->
         <item name="Golf" icon="presets/sport/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=golf" />
             <space />
             <key key="sport" value="golf" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
+            <combo key="leisure" text="Type" default="golf_course">
+                <list_entry value="golf_course" display_value="Golf course" icon="presets/sport/golf/golf.svg" />
+                <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Golf -->
         <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=boules" />
@@ -5555,7 +5627,9 @@
             <space />
             <key key="sport" value="field_hockey" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                <reference ref="sport_leisure_values" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Field Hockey -->
         <item name="Ice Hockey" icon="presets/sport/ice_hockey.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5563,14 +5637,20 @@
             <space />
             <key key="sport" value="ice_hockey" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                <list_entry value="ice_rink" display_value="Ice rink" />
+                <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Ice Hockey -->
         <item name="Curling" icon="presets/sport/curling.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=curling" />
             <space />
             <key key="sport" value="curling" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <list_entry value="ice_rink" display_value="Ice rink" />
+                 <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Curling -->
         <item name="Pelota" icon="presets/sport/pelota.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=pelota" />
@@ -5584,7 +5664,9 @@
             <space />
             <key key="sport" value="racquet" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Racquetball -->
         <item name="Table Tennis/Ping-Pong" icon="presets/sport/table_tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5592,7 +5674,9 @@
             <space />
             <key key="sport" value="table_tennis" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <combo key="leisure" text="Type">
+                 <reference ref="sport_leisure_values" />
+            </combo>
         </item> <!-- Table Tennis/Ping-Pong -->
         <item name="Tennis" icon="presets/sport/tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=tennis" />
@@ -5608,7 +5692,10 @@
             <space />
             <key key="sport" value="motor" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
+            <combo key="leisure" text="Type" values_context="racing">
+                 <reference ref="sport_leisure_values" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- Motorsport -->
         <item name="Kart Racing" icon="presets/sport/karting.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5616,7 +5703,11 @@
             <space />
             <key key="sport" value="karting" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
+            <combo key="leisure" text="Type" values_context="racing">
+                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- Kart Racing -->
         <item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5624,7 +5715,11 @@
             <space />
             <key key="sport" value="motocross" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
+            <combo key="leisure" text="Type" values_context="racing">
+                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
         </item> <!-- Motocross -->
         <separator/>
         <item name="Model Aerodrome" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5632,7 +5727,11 @@
             <space />
             <key key="sport" value="model_aerodrome" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
+            <combo key="leisure" text="Type" values_context="aerialway">
+                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- Model Aerodrome -->
         <item name="RC Car" icon="presets/sport/rc_car.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5640,7 +5739,11 @@
             <space />
             <key key="sport" value="rc_car" />
             <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
+            <combo key="leisure" text="Type" values_context="racing">
+                 <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                 <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+                 <list_entry value="track" display_value="Track" icon="presets/sport/track.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
         </item> <!-- RC Car -->
     </group> <!-- Motorsport -->
Index: resources/data/validator/combinations.mapcss
===================================================================
--- resources/data/validator/combinations.mapcss	(revision 18397)
+++ resources/data/validator/combinations.mapcss	(working copy)
@@ -313,7 +313,7 @@
   group: tr("suspicious tag combination");
 }
 
-/* {0.tag} together with {1.tag}, see #18411, #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186, #18815, #20960 */
+/* {0.tag} together with {1.tag}, see #18411, #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186, #18815, #20960, #21907 */
 *[barrier=kerb][kerb=no],
 way[highway=construction][construction][construction=~/^(yes|minor|no)$/],
 way[railway=construction][construction][construction=~/^(yes|minor|no)$/],
@@ -322,6 +322,7 @@
 *[man_made=bridge][bridge=yes],
 *[man_made=tunnel][tunnel=yes],
 *[amenity=police][police],
+*[leisure=horse_riding][sport=horse_racing],
 node[highway=crossing][crossing=no],
 node[railway=crossing][crossing=no],
 way[junction=yes][highway],