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,12 +231,81 @@
             <text key="operator" text="Operator" />
         </optional>
     </chunk>
+    <chunk id="pitch_sports-hall_sports-centre_stadium">
+        <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+        <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.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.svg" />
+    </chunk>
+    <chunk id="pitch_sports-hall_sports-centre_stadium_track">
+        <reference ref="pitch_sports-hall_sports-centre_stadium" />
+        <list_entry value="track" display_value="Racetrack" icon="presets/sport/track.svg" />
+    </chunk>
     <chunk id="name_leisure_pitch">
-        <text key="name" text="Name" />
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+        <reference ref="name_operator" />
+        <combo key="leisure" text="Type" default="pitch">
+            <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.svg" />
+        </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" />
+        <multiselect key="sport" text="Sport" values_context="sport">
+            <list_entry value="10pin" display_value="10pin" icon="presets/sport/10pin.svg" />
+            <list_entry value="9pin" display_value="9pin" icon="presets/sport/9pin.svg" />
+            <list_entry value="american_football" display_value="American Football" icon="presets/sport/football.svg" icon_size="16" />
+            <list_entry value="archery" display_value="Archery" icon="presets/sport/archery.svg" icon_size="16" />
+            <list_entry value="athletics" display_value="Athletics" icon="presets/sport/athletics.svg" icon_size="16" />
+            <list_entry value="australian_football" display_value="Australian Football" icon="presets/sport/football.svg" icon_size="16" />
+            <list_entry value="baseball" display_value="Baseball" icon="presets/sport/baseball.svg" icon_size="16" />
+            <list_entry value="basketball" display_value="Basketball" icon="presets/sport/basketball.svg" icon_size="16" />
+            <list_entry value="beachvolleyball" display_value="Beach Volleyball" icon="presets/sport/beachvolleyball.svg" icon_size="16" />
+            <list_entry value="billiards" display_value="Billiards" icon="presets/sport/billiards.svg" icon_size="16" />
+            <list_entry value="boules" display_value="Boules" icon="presets/sport/boule.svg" icon_size="16" />
+            <list_entry value="bowls" display_value="Lawn Bowling" icon="presets/sport/boule.svg" icon_size="16" />
+            <list_entry value="canadian_football" display_value="Canadian Football" icon="presets/sport/football.svg" icon_size="16" />
+            <list_entry value="canoe" display_value="Canoe" icon="presets/sport/canoe.svg" icon_size="16" />
+            <list_entry value="chess" display_value="Chess" icon="presets/sport/chess.svg" />
+            <list_entry value="climbing" display_value="Climbing" icon="presets/sport/climbing.svg" icon_size="16" />
+            <list_entry value="cricket" display_value="Cricket" icon="presets/sport/cricket.svg" icon_size="16" />
+            <list_entry value="croquet" display_value="Croquet" icon="presets/sport/croquet.svg" icon_size="16" />
+            <list_entry value="curling" display_value="Curling" icon="presets/sport/curling.svg" />
+            <list_entry value="cycling" display_value="Cycling" icon="presets/sport/cycling.svg" icon_size="16" />
+            <list_entry value="dog_racing" display_value="Dog Racing" icon="presets/sport/dog_racing.svg" />
+            <list_entry value="equestrian" display_value="Equestrian" icon="presets/sport/equestrian.svg" />
+            <list_entry value="field_hockey" display_value="Field Hockey" icon="presets/sport/field_hockey.svg" />
+            <list_entry value="fitness" display_value="Fitness" />
+            <list_entry value="gaelic_games" display_value="Gaelic Games" icon="presets/sport/soccer.svg" icon_size="16" />
+            <list_entry value="golf" display_value="Golf" icon="presets/sport/golf.svg" icon_size="16" />
+            <list_entry value="gymnastics" display_value="Gymnastics" icon="presets/sport/gymnastics.svg" icon_size="16" />
+            <list_entry value="handball" display_value="Handball" icon="presets/sport/handball.svg" icon_size="16" />
+            <list_entry value="horse_racing" display_value="Horse Racing" icon="presets/sport/riding.svg" icon_size="16" />
+            <list_entry value="ice_hockey" display_value="Ice Hockey" icon="presets/sport/ice_hockey.svg" />
+            <list_entry value="ice_skating" display_value="Ice Skating" icon="presets/sport/ice_skating.svg" icon_size="16" />
+            <list_entry value="karting" display_value="Karting" icon="presets/sport/karting.svg" />
+            <list_entry value="model_aerodrome" display_value="Model_aerodrome" icon="presets/transport/airport.svg" icon_size="16" />
+            <list_entry value="motocross" display_value="Motocross" icon="presets/sport/motocross.svg" icon_size="16" />
+            <list_entry value="motor" display_value="Motor" icon="presets/sport/motor.svg" />
+            <list_entry value="multi" display_value="Multi" icon="presets/sport/multi.svg" icon_size="16" />
+            <list_entry value="pelota" display_value="Pelota" icon="presets/sport/pelota.svg" />
+            <list_entry value="racquet" display_value="Racquet" icon="presets/sport/racquetball.svg" icon_size="16" />
+            <list_entry value="rc_car" display_value="RC Car" icon="presets/sport/rc_car.svg" />
+            <list_entry value="roller_skating" display_value="Roller Skating" icon="presets/sport/roller_skating.svg" />
+            <list_entry value="rowing" display_value="Rowing" icon="presets/sport/rowing.svg" icon_size="16" />
+            <list_entry value="rugby_league" display_value="Rugby League" icon="presets/sport/football.svg" icon_size="16" />
+            <list_entry value="rugby_union" display_value="Rugby Union" icon="presets/sport/football.svg" icon_size="16" />
+            <list_entry value="running" display_value="Running" icon="presets/sport/running.svg" icon_size="16" />
+            <list_entry value="safety_training" display_value="Safety Training" />
+            <list_entry value="scuba_diving" display_value="Scuba Diving" icon="presets/sport/scuba_diving.svg" icon_size="16" />
+            <list_entry value="shooting" display_value="Shooting" icon="presets/sport/range.svg" icon_size="16" />
+            <list_entry value="skateboard" display_value="Skateboard" icon="presets/sport/skateboard.svg" icon_size="16" />
+            <list_entry value="soccer" display_value="Soccer" icon="presets/sport/soccer.svg" icon_size="16" />
+            <list_entry value="surfing" display_value="Surfing" />
+            <list_entry value="swimming" display_value="Swimming" icon="presets/sport/swimming.svg" />
+            <list_entry value="table_tennis" display_value="Table Tennis" icon="presets/sport/table_tennis.svg" icon_size="16" />
+            <list_entry value="tennis" display_value="Tennis" icon="presets/sport/tennis.svg" icon_size="16" />
+            <list_entry value="volleyball" display_value="Volleyball" icon="presets/sport/volleyball.svg" icon_size="16" />
+	</multiselect>
     </chunk>
     <chunk id="highway_access">
         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,permit,private,customers,agricultural,forestry,no" values_sort="false" />
@@ -979,6 +1047,13 @@
             <space />
             <key key="highway" value="raceway" />
             <text key="name" text="Name" />
+            <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
+            <multiselect key="sport" text="Sport" values_context="sport" rows="4">
+                <list_entry value="karting" display_value="Karting" icon="presets/sport/karting.svg" />
+                <list_entry value="motocross" display_value="Motocross" icon="presets/sport/motocross.svg" icon_size="16" />
+                <list_entry value="motor" display_value="Motor" icon="presets/sport/motor.svg" />
+                <list_entry value="rc_car" display_value="RC Car" icon="presets/sport/rc_car.svg" />
+	    </multiselect>
         </item> <!-- Raceway -->
         <item name="Road (Unknown Type)" icon="presets/transport/way/way_road.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Tag:highway=road" />
@@ -2258,7 +2333,10 @@
                 <reference ref="oh_wheelchair" />
                 <reference ref="POI_access" />
                 <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
-                <multiselect key="sport" text="Sport" values="swimming;surfing" rows="2"/>
+                <multiselect key="sport" text="Sport" values_context="sport" rows="2">
+                    <list_entry value="surfing" display_value="Surfing" />
+                    <list_entry value="swimming" display_value="Swimming" icon="presets/sport/swimming.svg" />
+	        </multiselect>
                 <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
             </optional>
         </item> <!-- Beach -->
@@ -2840,7 +2918,7 @@
             <key key="shop" value="car" />
             <reference ref="car_brands" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Car Dealer -->
         <item name="Repair" icon="presets/vehicle/repair_shop.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2918,7 +2996,7 @@
             <reference ref="motorcycle_brands" />
             <text key="operator" text="Operator" />
             <reference ref="oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
             <optional text="Services:">
                 <combo key="sale" text="Sale" values="yes,brand,no" />
                 <combo key="rental" text="Rental" values="yes,brand,no" />
@@ -3944,7 +4022,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 +4046,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" />
@@ -3996,13 +4074,13 @@
             <space />
             <reference ref="POI_access" />
         </item> <!-- Swimming Pool -->
-        <item name="Dive centre" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Dive Center" icon="presets/leisure/dive_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=dive_centre" />
             <space />
             <key key="amenity" value="dive_centre" />
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Dive centre -->
+        </item> <!-- Dive Center -->
         <item name="Fitness Station" icon="presets/leisure/fitness_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=fitness_station" />
             <space />
@@ -4019,14 +4097,14 @@
             <reference ref="POI_access" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Sauna -->
-        <item name="Horse Riding" icon="presets/leisure/horse_riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Horseback Riding Facility" icon="presets/leisure/horse_riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=horse_riding" />
             <space />
             <key key="leisure" value="horse_riding" />
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="fee" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Horse Riding -->
+        </item> <!-- Horseback Riding Facility -->
         <item name="Club" icon="presets/leisure/club.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Key:club" />
             <space />
@@ -4097,12 +4175,12 @@
             <key key="leisure" value="firepit" />
             <text key="name" text="Name" />
         </item> <!-- Firepit -->
-        <item name="Fishing" icon="presets/sport/fishing.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fishing Place" icon="presets/sport/fishing.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=fishing" />
             <space />
             <key key="leisure" value="fishing" />
-            <text key="name" text="Name" />
-        </item> <!-- Fishing -->
+            <reference ref="name_operator" />
+        </item> <!-- Fishing Place -->
         <item name="Bird Hide" icon="presets/leisure/bird_hide.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:leisure=bird_hide" />
             <space />
@@ -4110,7 +4188,7 @@
             <reference ref="name_ref_operator" />
         </item> <!-- Bird Hide -->
         <separator/>
-        <item name="Amusement arcade" icon="presets/leisure/amusement_arcade.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Amusement Arcade" icon="presets/leisure/amusement_arcade.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=amusement_arcade" />
             <space />
             <key key="leisure" value="amusement_arcade" />
@@ -4119,13 +4197,13 @@
             <space />
             <reference ref="internet_smoking" />
             <reference ref="link_contact_address_payment" />
-            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
-            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling Hall" text="Similar but different tags:" />
             <preset_link preset_name="Casino" text="Similar but different tags:" />
             <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
             <preset_link preset_name="Lottery" text="Similar but different tags:" />
-        </item> <!-- Amusement arcade -->
-        <item name="Adult gaming centre" icon="presets/leisure/adult_gaming_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        </item> <!-- Amusement Arcade -->
+        <item name="Adult Gaming Center" icon="presets/leisure/adult_gaming_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=adult_gaming_centre" />
             <space />
             <key key="leisure" value="adult_gaming_centre" />
@@ -4134,14 +4212,14 @@
             <space />
             <reference ref="internet_smoking" />
             <reference ref="link_contact_address_payment" />
-            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
-            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
-            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling Hall" text="Similar but different tags:" />
             <preset_link preset_name="Casino" text="Similar but different tags:" />
             <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
             <preset_link preset_name="Lottery" text="Similar but different tags:" />
-        </item> <!-- Adult gaming centre -->
-        <item name="Gambling" icon="presets/leisure/gambling.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        </item> <!-- Adult Gaming Center -->
+        <item name="Gambling Hall" icon="presets/leisure/gambling.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=gambling" />
             <space />
             <key key="amenity" value="gambling" />
@@ -4151,12 +4229,12 @@
             <space />
             <reference ref="internet_smoking" />
             <reference ref="link_contact_address_payment" />
-            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
-            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
+            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
             <preset_link preset_name="Casino" text="Similar but different tags:" />
             <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
             <preset_link preset_name="Lottery" text="Similar but different tags:" />
-        </item> <!-- Gambling -->
+        </item> <!-- Gambling Hall -->
         <item name="Casino" icon="presets/leisure/casino.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=casino" />
             <space />
@@ -4166,9 +4244,9 @@
             <space />
             <reference ref="internet_smoking" />
             <reference ref="link_contact_address_payment" />
-            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
-            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
-            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling Hall" text="Similar but different tags:" />
             <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
             <preset_link preset_name="Lottery" text="Similar but different tags:" />
         </item> <!-- Casino -->
@@ -4222,7 +4300,7 @@
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
         </item> <!-- Gallery -->
-        <item name="Theatre" icon="presets/leisure/theater.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Theater" icon="presets/leisure/theater.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=theatre" />
             <space />
             <key key="amenity" value="theatre" />
@@ -4230,7 +4308,7 @@
             <reference ref="wheelchair" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
-        </item> <!-- Theatre -->
+        </item> <!-- Theater -->
         <item name="Library" icon="presets/education/library.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=library" />
             <space />
@@ -4249,14 +4327,14 @@
             <reference ref="oh_wheelchair" />
             <reference ref="POI_access" />
         </item> <!-- Public bookcase -->
-        <item name="Arts Centre" icon="presets/sightseeing/arts_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Arts Center" icon="presets/sightseeing/arts_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=arts_centre" />
             <space />
             <key key="amenity" value="arts_centre" />
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
-        </item> <!-- Arts Centre -->
+        </item> <!-- Arts Center -->
         <item name="Artwork" icon="presets/sightseeing/arts_centre.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:tourism=artwork" />
             <space />
@@ -4387,10 +4465,10 @@
             <reference ref="link_contact_address" />
             <preset_link preset_name="Building" />
         </item> <!-- Town Hall -->
-        <item name="Community Centre" icon="presets/service/community_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Community Center" icon="presets/service/community_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=community_centre" />
             <space />
-            <label text="Community Centre" />
+            <label text="Community Center" />
             <space />
             <key key="amenity" value="community_centre" />
             <reference ref="name_operator_oh_wheelchair" />
@@ -4398,7 +4476,7 @@
             <multiselect key="community_centre:for" text="For" values="child;juvenile;student;girl;boy;man;woman;senior;family;homosexual;multigeneration;disabled;athlete;immigrant;lgbtq" />
             <reference ref="link_contact_address" />
             <preset_link preset_name="Building" />
-        </item> <!-- Community Centre -->
+        </item> <!-- Community Center -->
         <item name="Courthouse" icon="presets/service/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=courthouse" />
             <space />
@@ -4930,7 +5008,7 @@
                 <check key="recycling:electrical_appliances" text="Electrical Appliances" />
             </checkgroup>
         </item> <!-- Recycling Container-->
-        <item name="Recycling Centre" icon="presets/service/recycling/recycling_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Recycling Center" icon="presets/service/recycling/recycling_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
            <link wiki="Tag:amenity=recycling" />
             <space />
             <key key="amenity" value="recycling" />
@@ -4962,7 +5040,7 @@
                 <check key="recycling:electrical_appliances" text="Electrical Appliances" />
             </checkgroup>
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Recycling Centre-->
+        </item> <!-- Recycling Center-->
         <item name="Waste Basket/Trash Can" icon="presets/service/recycling/waste_basket.svg" type="node" preset_name_label="true">
             <link wiki="Tag:amenity=waste_basket" />
             <key key="amenity" value="waste_basket" />
@@ -5091,53 +5169,91 @@
             <link wiki="Tag:leisure=stadium" />
             <space />
             <key key="leisure" value="stadium" />
-            <text key="name" text="Name" />
             <reference ref="sport" />
+            <reference ref="name_operator_oh_wheelchair" />
             <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" />
-            <text key="name" text="Name" />
             <reference ref="sport" />
+            <reference ref="name_operator_oh_wheelchair" />
             <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">
+            <preset_link preset_name="Sports Hall" text="Similar but different tags:" />
+        </item> <!-- Sports Center -->
+        <item name="Sports Hall" icon="presets/sport/sports_hall.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:leisure=sports_hall" />
+            <space />
+            <key key="leisure" value="sports_hall" />
+            <reference ref="sport" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
+            <preset_link preset_name="Sports Center" text="Similar but different tags:" />
+        </item> <!-- Sports Hall -->
+        <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" />
-            <text key="name" text="Name" />
             <reference ref="sport" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
-        </item> <!-- Fitness Centre -->
+        </item> <!-- Fitness Center -->
+        <item name="Ice Rink" icon="presets/sport/ice_rink.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:leisure=ice_rink" />
+            <space />
+            <key key="leisure" value="ice_rink" />
+            <multiselect key="sport" text="Sport" values_context="sport" rows="3">
+                 <list_entry value="curling" display_value="Curling" icon="presets/sport/curling.svg" />
+                 <list_entry value="ice_hockey" display_value="Ice Hockey" icon="presets/sport/ice_hockey.svg" />
+                 <list_entry value="ice_skating" display_value="Ice Skating" icon="presets/sport/ice_skating.svg" icon_size="16" />
+	    </multiselect>
+            <reference ref="name_operator_oh_wheelchair" />
+            <check key="lit" text="Lit" />
+            <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
+        </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 />
             <key key="leisure" value="pitch" />
-            <text key="name" text="Name" />
             <reference ref="sport" />
+            <reference ref="name_operator" />
             <reference ref="sport_surface" />
+            <check key="lit" text="Lit" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pitch -->
         <item name="Racetrack" icon="presets/sport/track.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=track" />
             <space />
             <key key="leisure" value="track" />
-            <text key="name" text="Name" />
-            <multiselect key="sport" text="Sport" values="athletics;cycling;dog_racing;equestrian;horse_racing;running;roller_skating;ice_skating" values_context="sport" />
+            <multiselect key="sport" text="Sport" values_context="sport">
+                <list_entry value="athletics" display_value="Athletics" icon="presets/sport/athletics.svg" icon_size="16" />
+                <list_entry value="cycling" display_value="Cycling" icon="presets/sport/cycling.svg" icon_size="16" />
+                <list_entry value="dog_racing" display_value="Dog Racing" icon="presets/sport/dog_racing.svg" />
+                <list_entry value="equestrian" display_value="Equestrian" icon="presets/sport/equestrian.svg" />
+                <list_entry value="horse_racing" display_value="Horse Racing" icon="presets/sport/riding.svg" icon_size="16" />
+                <list_entry value="ice_skating" display_value="Ice Skating" icon="presets/sport/ice_skating.svg" icon_size="16" />
+                <list_entry value="roller_skating" display_value="Roller Skating" icon="presets/sport/roller_skating.svg" />
+                <list_entry value="running" display_value="Running" icon="presets/sport/running.svg" icon_size="16" />
+	    </multiselect>
+            <reference ref="name_operator" />
             <reference ref="sport_surface" />
-            <check key="area" text="Area" />
+            <checkgroup columns="2">
+                <check key="area" text="Area" />
+                <check key="lit" text="Lit" />
+            </checkgroup>
         </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_operator_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 +5284,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" />
@@ -5208,7 +5324,7 @@
             <link wiki="Tag:leisure=miniature_golf" />
             <space />
             <key key="leisure" value="miniature_golf" />
-            <reference ref="name_oh_wheelchair" />
+            <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Miniature Golf -->
     </group> <!-- Sport Facilities -->
     <group name="Sport" icon="presets/sport/multi.svg">
@@ -5216,39 +5332,50 @@
             <link wiki="Tag:sport=multi" />
             <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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values_context="running">
+                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
+                <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">
             <link wiki="Tag:sport=9pin" />
             <space />
             <key key="sport" value="9pin" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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">
             <link wiki="Tag:sport=10pin" />
             <space />
             <key key="sport" value="10pin" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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">
             <link wiki="Tag:sport=archery" />
             <space />
             <key key="sport" value="archery" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values_context="running" default="track">
+                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
+            </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,15 +5383,23 @@
             <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">
+                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.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.svg" />
+                <list_entry value="track" display_value="Racetrack" 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">
             <link wiki="Tag:sport=climbing" />
             <space />
             <key key="sport" value="climbing" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="sports_centre" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
+                <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" />
@@ -5307,80 +5442,109 @@
             <link wiki="Tag:sport=canoe" />
             <space />
             <key key="sport" value="canoe" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
         </item> <!-- Canoeing/Kayaking -->
         <item name="Rowing" icon="presets/sport/rowing.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=rowing" />
             <space />
             <key key="sport" value="rowing" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
         </item> <!-- Rowing -->
         <item name="Cycling" icon="presets/sport/cycling.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=cycling" />
             <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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values_context="racing">
+                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
+            </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">
             <link wiki="Tag:sport=dog_racing" />
             <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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values_context="racing">
+                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Dog Racing -->
         <item name="Equestrian" icon="presets/sport/equestrian.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=equestrian" />
             <space />
             <key key="sport" value="equestrian" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values_context="riding">
+                <list_entry value="horse_riding" display_value="Horseback Riding Facility" icon="presets/leisure/horse_riding.svg" />
+                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
+            </combo>
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
         <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=horse_racing" />
             <space />
             <key key="sport" value="horse_racing" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
+            <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="Racetrack" 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">
             <link wiki="Tag:sport=gymnastics" />
             <space />
             <key key="sport" value="gymnastics" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" >
+                <list_entry value="fitness_centre" display_value="Fitness Center" icon="presets/sport/fitness_centre.svg" />
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="ice_rink">
+                <list_entry value="ice_rink" display_value="Ice Rink" icon="presets/sport/ice_rink.svg" />
+                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
+            </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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium_track" />
+            </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">
             <link wiki="Tag:sport=skateboard" />
             <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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="pitch" values_context="racing">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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">
             <link wiki="Tag:sport=swimming" />
             <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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="swimming_pool" values_searchable="true">
+                <list_entry value="swimming_pool" display_value="Swimming Pool" icon="presets/sport/swimming.svg" />
+                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.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.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" />
@@ -5391,7 +5555,7 @@
         <item name="Skiing" icon="presets/sport/skiing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Piste_Maps" />
             <space />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
             <combo key="piste:type" text="Piste type" values="connection,downhill,hike,ice_skate,nordic,playground,skitour,sled,sleigh,snow_park" values_searchable="true" match="keyvalue"/>
             <optional>
                 <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" values_sort="false" />
@@ -5402,15 +5566,20 @@
             <link wiki="Tag:sport=shooting" />
             <space />
             <key key="sport" value="shooting" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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" />
+            <reference ref="name_operator" />
+            <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">
@@ -5418,7 +5587,10 @@
             <link wiki="Tag:sport=soccer" />
             <space />
             <key key="sport" value="soccer" />
-            <reference ref="name_leisure_pitch" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="pitch">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Soccer -->
         <item name="Australian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5439,7 +5611,10 @@
             <link wiki="Tag:sport=canadian_football" />
             <space />
             <key key="sport" value="canadian_football" />
-            <reference ref="name_leisure_pitch" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="pitch">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Canadian Football -->
         <item name="Gaelic Games" icon="presets/sport/soccer.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5474,14 +5649,20 @@
             <link wiki="Tag:sport=baseball" />
             <space />
             <key key="sport" value="baseball" />
-            <reference ref="name_leisure_pitch" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="pitch">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Baseball -->
         <item name="Basketball" icon="presets/sport/basketball.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=basketball" />
             <space />
             <key key="sport" value="basketball" />
-            <reference ref="name_leisure_pitch" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="pitch">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </combo>
             <reference ref="sport_surface" />
             <combo key="hoops" text="Hoops" values="1,2,3,4" />
         </item> <!-- Basketball -->
@@ -5490,7 +5671,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="pitch_sports-hall_sports-centre_stadium" />
+            </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 +5681,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="pitch_sports-hall_sports-centre_stadium" />
+            </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 +5691,34 @@
             <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">
+                <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.svg" />
+            </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">
+                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
+                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+            </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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="golf_course">
+                <list_entry value="golf_course" display_value="Golf Course" icon="presets/sport/golf/golf.svg" icon_size="16" />
+                <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.svg" />
+            </combo>
         </item> <!-- Golf -->
         <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=boules" />
@@ -5554,23 +5752,31 @@
             <link wiki="Tag:sport=field_hockey" />
             <space />
             <key key="sport" value="field_hockey" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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">
             <link wiki="Tag:sport=ice_hockey" />
             <space />
             <key key="sport" value="ice_hockey" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <list_entry value="ice_rink" display_value="Ice Rink" icon="presets/sport/ice_rink.svg" />
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <list_entry value="ice_rink" display_value="Ice Rink" icon="presets/sport/ice_rink.svg" />
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </combo>
         </item> <!-- Curling -->
         <item name="Pelota" icon="presets/sport/pelota.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=pelota" />
@@ -5583,67 +5789,98 @@
             <link wiki="Tag:sport=racquet" />
             <space />
             <key key="sport" value="racquet" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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">
             <link wiki="Tag:sport=table_tennis" />
             <space />
             <key key="sport" value="table_tennis" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </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" />
             <space />
             <key key="sport" value="tennis" />
-            <reference ref="name_leisure_pitch" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" default="pitch">
+                <reference ref="pitch_sports-hall_sports-centre_stadium" />
+            </combo>
             <reference ref="sport_surface" />
         </item> <!-- Tennis -->
     </group> <!-- Sport (Ball) -->
-    <group name="Motorsport" icon="presets/vehicle/motorbike.svg">
-        <item name="Motorsport" icon="presets/sport/motor.svg" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Motor Sport" icon="presets/vehicle/motorbike.svg">
+        <item name="Motor Sport" icon="presets/sport/motor.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=motor" />
             <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" />
+            <reference ref="name_operator" />
+            <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="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
-        </item> <!-- Motorsport -->
+            <preset_link preset_name="Raceway" />
+        </item> <!-- Motor Sport -->
         <item name="Kart Racing" icon="presets/sport/karting.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=karting" />
             <space />
             <key key="sport" value="karting" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
+            <reference ref="name_operator" />
+            <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="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
+            <preset_link preset_name="Raceway" />
         </item> <!-- Kart Racing -->
         <item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=motocross" />
             <space />
             <key key="sport" value="motocross" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
+            <reference ref="name_operator" />
+            <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="stadium" display_value="Stadium" icon="presets/sport/stadium.svg" />
+            </combo>
+            <preset_link preset_name="Raceway" />
         </item> <!-- Motocross -->
         <separator/>
         <item name="Model Aerodrome" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:sport=model_aerodrome" />
             <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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values_context="aerialway">
+                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
+                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.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">
             <link wiki="Tag:sport=rc_car" />
             <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" />
+            <reference ref="name_operator" />
+            <combo key="leisure" text="Type" values_context="racing">
+                <list_entry value="pitch" display_value="Pitch" icon="presets/sport/pitch.svg" />
+                <list_entry value="sports_hall" display_value="Sports Hall" icon="presets/sport/sports_hall.svg" />
+                <list_entry value="sports_centre" display_value="Sports Center" icon="presets/sport/sports_centre.svg" />
+            </combo>
             <combo key="surface" text="Surface" values="asphalt,concrete,ground" />
+            <preset_link preset_name="Raceway" />
         </item> <!-- RC Car -->
-    </group> <!-- Motorsport -->
+    </group> <!-- Motor Sport -->
   </group> <!-- Sports -->
   <group name="Man Made" icon="presets/landmark/works.svg">
     <group name="Man Made" icon="presets/landmark/works.svg">
@@ -7296,7 +7533,7 @@
             <space />
             <key key="shop" value="clothes" />
             <reference ref="name_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
             <combo key="organic" text="Organic" values="yes,no,only" />
             <multiselect key="clothes" text="Clothes" values="babies;children;costumes;denim;fashion;fur;hats;leather;maternity;men;motorcycle;oversize;schoolwear;sports;suits;swimwear;traditional;underwear;wedding;women;workwear" values_context="clothes" values_searchable="true" />
             <reference ref="link_contact_address_payment" />
@@ -7313,7 +7550,7 @@
             <space />
             <key key="shop" value="shoes" />
             <reference ref="name_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
             <combo key="organic" text="Organic" values="yes,no,only" />
             <check key="shoes:repair" text="Offers repairs" text_context="shoes" />
             <reference ref="link_contact_address_payment" />
@@ -7598,7 +7835,7 @@
             <space />
             <key key="shop" value="books" />
             <reference ref="name_brand_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="second_hand" text="Second Hand" values="yes,no,only" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Book Store -->
         <item name="Newspaper Stand" icon="presets/shop/news.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -7753,13 +7990,13 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Florist -->
-        <item name="Garden Centre" icon="presets/shop/garden_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Garden Center" icon="presets/shop/garden_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=garden_centre" />
             <space />
             <key key="shop" value="garden_centre" />
             <reference ref="name_brand_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Garden Centre -->
+        </item> <!-- Garden Center -->
         <separator/>
         <item name="Do-It-Yourself Store" icon="presets/shop/diy_store.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=doityourself" />
@@ -7876,7 +8113,7 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Charity -->
-        <item name="Second hand" icon="presets/shop/second_hand.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Second Hand" icon="presets/shop/second_hand.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=second_hand" />
             <space />
             <key key="shop" value="second_hand" />
@@ -7884,16 +8121,16 @@
             <space />
             <label text="Alternative tagging: `shop=*` + `second_hand=yes` or `second_hand=only`" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Second hand -->
+        </item> <!-- Second Hand -->
         <item name="Bookmaker" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=bookmaker" />
             <space />
             <key key="shop" value="bookmaker" />
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
-            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
-            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling Hall" text="Similar but different tags:" />
             <preset_link preset_name="Casino" text="Similar but different tags:" />
             <preset_link preset_name="Lottery" text="Similar but different tags:" />
         </item> <!-- Bookmaker -->
@@ -7903,9 +8140,9 @@
             <key key="shop" value="lottery" />
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-            <preset_link preset_name="Amusement arcade" text="Similar but different tags:" />
-            <preset_link preset_name="Adult gaming centre" text="Similar but different tags:" />
-            <preset_link preset_name="Gambling" text="Similar but different tags:" />
+            <preset_link preset_name="Amusement Arcade" text="Similar but different tags:" />
+            <preset_link preset_name="Adult Gaming Center" text="Similar but different tags:" />
+            <preset_link preset_name="Gambling Hall" text="Similar but different tags:" />
             <preset_link preset_name="Casino" text="Similar but different tags:" />
             <preset_link preset_name="Bookmaker" text="Similar but different tags:" />
         </item> <!-- Lottery -->
@@ -8513,14 +8750,14 @@
             <text key="population" text="Population" />
             <text key="website" text="Website" />
         </item> <!-- Quarter -->
-        <item name="Neighbourhood" icon="presets/place/neighbourhood.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
+        <item name="Neighborhood" icon="presets/place/neighbourhood.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=neighbourhood" />
             <space />
             <key key="place" value="neighbourhood" />
             <reference ref="name_wikipedia_wikidata" />
             <text key="population" text="Population" />
             <text key="website" text="Website" />
-        </item> <!-- Neighbourhood -->
+        </item> <!-- Neighborhood -->
         <item name="Farm" icon="presets/place/farm.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link wiki="Tag:place=farm" />
             <space />
@@ -9237,7 +9474,7 @@
                 <role key="outer" text="outer segment" requisite="required" type="way,closedway" />
                 <role key="inner" text="inner segment" requisite="optional" type="way,closedway" />
                 <role key="subarea" text="Sub area" requisite="optional" type="relation" />
-                <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />
+                <role key="admin_centre" text="Administration center" requisite="optional" type="node" count="1" />
                 <role key="label" text="Label point" requisite="optional" type="node" count="1" />
             </roles>
         </item> <!-- Boundary -->
Index: resources/styles/standard/elemstyles.mapcss
===================================================================
--- resources/styles/standard/elemstyles.mapcss	(revision 18400)
+++ resources/styles/standard/elemstyles.mapcss	(working copy)
@@ -2027,6 +2027,7 @@
 area[leisure=bandstand],
 area[leisure=bleachers],
 area[leisure=sports_centre],
+area[leisure=sports_hall],
 area[leisure=fitness_centre],
 area[leisure=stadium],
 area[leisure=horse_riding],
@@ -2051,6 +2052,10 @@
     icon-image: "presets/sport/sports_centre.svg";
     set icon_z17;
 }
+node[leisure=sports_hall] {
+    icon-image: "presets/sport/sports_hall.svg";
+    set icon_z17;
+}
 node[leisure=fitness_centre] {
     icon-image: "presets/sport/fitness_centre.svg";
     set icon_z17;
@@ -2204,7 +2209,7 @@
     set icon_z17;
 }
 node[leisure=ice_rink] {
-    icon-image: "presets/sport/ice_hockey.svg";
+    icon-image: "presets/sport/ice_rink.svg";
     set icon_z17;
 }
 node[leisure=sauna] {
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],