diff --git a/src/main/assets/images/icons/png/amenity_dressing_room.png b/src/main/assets/images/icons/png/amenity_dressing_room.png
new file mode 100644
index 0000000000..d249718a82
Binary files /dev/null and b/src/main/assets/images/icons/png/amenity_dressing_room.png differ
diff --git a/src/main/assets/images/icons/png/amenity_post_depot.png b/src/main/assets/images/icons/png/amenity_post_depot.png
new file mode 100644
index 0000000000..f7f6a64572
Binary files /dev/null and b/src/main/assets/images/icons/png/amenity_post_depot.png differ
diff --git a/src/main/assets/images/icons/png/amenity_research.png b/src/main/assets/images/icons/png/amenity_research.png
new file mode 100644
index 0000000000..0e023f70cf
Binary files /dev/null and b/src/main/assets/images/icons/png/amenity_research.png differ
diff --git a/src/main/assets/images/icons/png/barrier_rope_13030.png b/src/main/assets/images/icons/png/barrier_rope_13030.png
new file mode 100644
index 0000000000..4e70d69a9f
Binary files /dev/null and b/src/main/assets/images/icons/png/barrier_rope_13030.png differ
diff --git a/src/main/assets/images/icons/png/office_construction_company.png b/src/main/assets/images/icons/png/office_construction_company.png
new file mode 100644
index 0000000000..5516d9b781
Binary files /dev/null and b/src/main/assets/images/icons/png/office_construction_company.png differ
diff --git a/src/main/assets/images/icons/png/office_courier.png b/src/main/assets/images/icons/png/office_courier.png
new file mode 100644
index 0000000000..1983f1fc13
Binary files /dev/null and b/src/main/assets/images/icons/png/office_courier.png differ
diff --git a/src/main/assets/images/icons/png/office_engineer.png b/src/main/assets/images/icons/png/office_engineer.png
new file mode 100644
index 0000000000..4730b36ddb
Binary files /dev/null and b/src/main/assets/images/icons/png/office_engineer.png differ
diff --git a/src/main/assets/images/icons/png/office_financial_advisor.png b/src/main/assets/images/icons/png/office_financial_advisor.png
new file mode 100644
index 0000000000..d872dceb8d
Binary files /dev/null and b/src/main/assets/images/icons/png/office_financial_advisor.png differ
diff --git a/src/main/assets/images/icons/png/office_property_management.png b/src/main/assets/images/icons/png/office_property_management.png
new file mode 100644
index 0000000000..f05dafb3be
Binary files /dev/null and b/src/main/assets/images/icons/png/office_property_management.png differ
diff --git a/src/main/assets/images/icons/png/shopping_repair.png b/src/main/assets/images/icons/png/shopping_repair.png
new file mode 100644
index 0000000000..6d28b40c2a
Binary files /dev/null and b/src/main/assets/images/icons/png/shopping_repair.png differ
diff --git a/src/main/assets/images/icons/png/water_quay.png b/src/main/assets/images/icons/png/water_quay.png
new file mode 100644
index 0000000000..958bde5eed
Binary files /dev/null and b/src/main/assets/images/icons/png/water_quay.png differ
diff --git a/src/main/assets/preset.xml b/src/main/assets/preset.xml
index c337d88d89..556d220eff 100644
--- a/src/main/assets/preset.xml
+++ b/src/main/assets/preset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.20.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM" description="General purpose OpenStreetMap preset for Vespucci and JOSM, based on the original JOSM version" object_keys="advertising,attraction,area:highway,building:part,cemetery,club,disc_golf,disused:amenity,disused:leisure,disused:man_made,disused:shop,golf,ford,hazard,noexit,indoor,playground,pipeline,piste:type,police,public_transport,traffic_calming,traffic_sign,traffic_sign:backward,traffic_sign:forward,marker,mountain_pass,telecom">
+<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.22.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM" description="General purpose OpenStreetMap preset for Vespucci and JOSM, based on the original JOSM version" object_keys="advertising,attraction,area:highway,building:part,cemetery,club,disc_golf,disused:amenity,disused:leisure,disused:man_made,disused:shop,golf,ford,harbour,hazard,noexit,indoor,playground,pipeline,piste:type,police,public_transport,traffic_calming,traffic_sign,traffic_sign:backward,traffic_sign:forward,marker,mountain_pass,telecom">
 <!--
     Icons have been derived from mainly from
   
@@ -779,6 +779,9 @@
             </checkgroup>
         </optional>
     </chunk>
+    <chunk id="mooring">
+        <combo key="mooring" text="Mooring" values="yes,no,private,permit,commercial" display_values="Yes,No,Private,Permit required,Commercial"/>
+    </chunk>
     <chunk id="optional_height">
         <optional>
             <text key="height" text="Height (meters)" length="7" value_type="dimension_vertical"/>
@@ -816,6 +819,7 @@
             <list_entry value="10pin" display_value="10pin"/>
             <list_entry value="9pin" display_value="9pin"/>
             <list_entry value="american_football" display_value="American football"/>
+            <list_entry value="american_handball" display_value="American handball"/>
             <list_entry value="archery" display_value="Archery"/>
             <list_entry value="athletics" display_value="Athletics"/>
             <list_entry value="australian_football" display_value="Australian football"/>
@@ -838,6 +842,7 @@
             <list_entry value="equestrian" display_value="Equestrian"/>
             <list_entry value="field_hockey" display_value="Field hockey"/>
             <list_entry value="fitness" display_value="Fitness"/>
+            <list_entry value="four_square" display_value="Four square"/>
             <list_entry value="free_flying" display_value="Free flying"/>
             <list_entry value="futsal" display_value="Futsal"/>
             <list_entry value="gaelic_games" display_value="Gaelic games"/>
@@ -858,6 +863,7 @@
             <list_entry value="netball" display_value="Netball"/>
             <list_entry value="orienteering" display_value="Orienteering"/>
             <list_entry value="padel" display_value="Padel"/>
+            <list_entry value="paintball" display_value="Paintball"/>
             <list_entry value="pelota" display_value="Pelota"/>
             <list_entry value="pickleball" display_value="Pickleball"/>
             <list_entry value="racquet" display_value="Racquet"/>
@@ -878,8 +884,10 @@
             <list_entry value="soccer" display_value="Soccer"/>
             <list_entry value="speedway" display_value="Speedway"/>
             <list_entry value="swimming" display_value="Swimming"/>
+            <list_entry value="table_soccer" display_value="Table soccer"/>
             <list_entry value="table_tennis" display_value="Table tennis"/>
             <list_entry value="tennis" display_value="Tennis"/>
+            <list_entry value="teatherball" display_value="Teatherball"/>
             <list_entry value="volleyball" display_value="Volleyball"/>
             <list_entry value="yoga" display_value="Yoga"/>
         </multiselect>
@@ -3224,6 +3232,11 @@
             <key key="barrier" value="cable_barrier"/>
             <reference ref="optional_height"/>
         </item> <!-- Cable barrier -->
+        <item name="Rope" icon="icons/png/barrier_rope_13030.png" type="node,way,closedway" preset_name_label="true">
+            <link wiki="Tag:barrier=rope"/>
+            <key key="barrier" value="rope"/>
+            <reference ref="optional_height"/>
+        </item> <!-- Rope -->
         <item name="Wall" icon="icons/png/barrier_wall.png" type="way,multipolygon,closedway" preset_name_label="true">
             <link wiki="Tag:barrier=wall"/>
             <key key="barrier" value="wall"/>
@@ -3985,7 +3998,7 @@
                 <space/>
                 <key key="amenity" value="ferry_terminal"/>
                 <text key="name" text="Name"/>
-                <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo"/>
+                <multiselect key="cargo" text="Cargo" values="passengers;vehicle;bicycle;hgv;container;dry_bulk;liquid_bulk" display_values="Passengers;Vehicles;Bicycles;HGVs;Containers;Dry bulk goods;Liquid bulk goods" values_context="cargo"/>
                 <preset_link preset_name="No name"/>
             </item> <!-- Ferry Terminal -->
             <item name="Ferry Route" icon="icons/png/water_route_sp.png" type="way,closedway,relation" preset_name_label="true" name_template="Ferry ({operator} ?{'{name} ' | ''}{ref} ?{'{from} - {via} - {to}' | '{from} - {to}' | '{from}' | '{to}'})">
@@ -4010,6 +4023,13 @@
                 <reference ref="sanitary_dump_station"/>
                 <preset_link preset_name="No name"/>
             </item> <!-- Marina -->
+            <item name="Harbour" icon="icons/png/transport_marina.png" type="node,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Key:harbour"/>
+                <space/>
+                <key key="harbour" value="yes"/>
+                <reference ref="name_operator"/>
+                <reference ref="link_contact_address"/>
+            </item>
             <item name="Marine Fuel" icon="icons/png/transport_fuel.png" type="node,closedway,multipolygon" preset_name_label="true">
                 <link wiki="Tag:waterway=fuel"/>
                 <space/>
@@ -4085,9 +4105,16 @@
                 <space/>
                 <key key="man_made" value="pier"/>
                 <reference ref="optional_name"/>
-                <combo key="mooring" text="Mooring" values="yes,no,private,permit,commercial" display_values="Yes,No,Private,Permit required,Commercial"/>
+                <reference ref="mooring"/>
                 <check key="floating" text="Floating"/>
             </item> <!-- Pier -->
+            <item name="Quay" icon="icons/png/water_quay.png" type="way,closedway,multipolygon" preset_name_label="true">
+                <link wiki="Tag:man_made=quay"/>
+                <space/>
+                <key key="man_made" value="quay"/>
+                <reference ref="optional_name"/>
+                <reference ref="mooring"/> 
+            </item> <!-- Quay -->
             <item name="Lock Gate" icon="icons/png/water_lock_gate_34007.png" type="node,way" preset_name_label="true">
                 <link wiki="Tag:waterway=lock_gate"/>
                 <key key="waterway" value="lock_gate"/>
@@ -6158,8 +6185,10 @@
                     <check text="Climbing wall" key="playground:climbingwall" disable_off="true" text_context="leisure"/>
                     <check text="Cushion" key="playground:cushion" disable_off="true" text_context="leisure"/>
                     <check text="Exercise" key="playground:exercise" disable_off="true" text_context="leisure"/>
+                    <check text="Funnel ball" key="playground:funnel_ball" disable_off="true" text_context="leisure"/>
                     <check text="Hopscotch" key="playground:hopscotch" disable_off="true" text_context="leisure"/>
                     <check text="Horizontal bar" key="playground:horizontal_bar" disable_off="true" text_context="leisure"/>
+                    <check text="Map" key="playground:map" disable_off="true" text_context="leisure"/>
                     <check text="Multi play" key="playground:multi_play" disable_off="true" text_context="leisure"/>
                     <check text="Playhouse" key="playground:playhouse" disable_off="true" text_context="leisure"/>
                     <check text="Roundabout" key="playground:roundabout" disable_off="true" text_context="leisure"/>
@@ -6202,8 +6231,10 @@
                 <list_entry value="climbingwall" display_value="Climbing wall"/>
                 <list_entry value="cushion" display_value="Cushion"/>
                 <list_entry value="exercise" display_value="Exercise"/>
+                <list_entry value="funnel_ball" display_value="Funnel ball"/>
                 <list_entry value="hopscotch" display_value="Hopscotch"/>
                 <list_entry value="horizontal_bar" display_value="Horizontal bar"/>
+                <list_entry value="map" display_value="Map"/>
                 <list_entry value="multi_play" display_value="Multi play"/>
                 <list_entry value="playhouse" display_value="Playhouse"/>
                 <list_entry value="roundabout" display_value="Roundabout"/>
@@ -6538,7 +6569,18 @@
             <link wiki="Tag:tourism=artwork"/>
             <space/>
             <key key="tourism" value="artwork"/>
-            <combo key="artwork_type" text="Type" values="architecture,mural,painting,sculpture,statue,bust,stone,installation,graffiti" display_values="Architecture,Mural,Painting,Sculpture,Statue,Bust,Stone,Installation,Graffiti" values_searchable="true"/>
+            <combo key="artwork_type" text="Type" values_searchable="true">
+                <list_entry value="architecture" display_value="Architecture"/>
+                <list_entry value="bust" display_value="Bust"/>
+                <list_entry value="graffiti" display_value="Graffiti"/>
+                <list_entry value="installation" display_value="Installation"/>
+                <list_entry value="mosaic" display_value="Mosaic"/>
+                <list_entry value="mural" display_value="Mural"/>
+                <list_entry value="painting" display_value="Painting"/>
+                <list_entry value="sculpture" display_value="Sculpture"/>
+                <list_entry value="statue" display_value="Statue"/>
+                <list_entry value="stone" display_value="Stone"/>
+            </combo>
             <text key="name" text="Name"/>
             <text key="artwork_subject" text="Subject"/>
             <text key="artist_name" text="Artist Name"/>
@@ -7585,7 +7627,7 @@
                 <reference ref="fee"/>
                 <reference ref="changing_table"/>
                 <text key="operator" text="Operator"/>
-                <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" display_values="Seated,Seated urinal,Squat,Urinal"/>
+                <multiselect key="toilets:position" text="Usage Position" values="seated;squat;urinal" display_values="Seated;Squat;Urinal"/>
                 <reference ref="oh_wheelchair_level"/>
                 <check key="drinking_water" text="Drinking Water"/>
                 <check key="toilets:handwashing" text="Handwashing facilities"/>
@@ -7609,6 +7651,25 @@
                 <reference ref="oh_wheelchair_level"/>
             </optional>
         </item> <!-- Shower -->
+        <item name="Dressing room" icon="icons/png/amenity_dressing_room.png" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=dressing_rooom"/>
+            <space/>
+            <key key="amenity" value="dressing_room"/>
+            <reference ref="facility_access"/>
+            <optional>
+                <checkgroup text="Gender" columns="3">
+                    <check key="female" text="Female" text_context="restroom" disable_off="true"/>
+                    <check key="male" text="Male" text_context="restroom" disable_off="true"/>
+                    <check key="unisex" text="Unisex" text_context="restroom" disable_off="true"/>
+                </checkgroup>
+                <check key="locker" text="Lockers"/>
+                <text key="description" text="Description" length="255"/>
+                <reference ref="fee"/>
+                <text key="operator" text="Operator"/>
+                <reference ref="supervised"/>
+                <reference ref="oh_wheelchair_level"/>
+            </optional>
+        </item> <!-- Dressing room -->
         <item name="Smoking area" icon="icons/png/amenity_tobacco_29141.png" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:amenity=smoking_area"/>
             <space/>
@@ -7645,6 +7706,14 @@
             <reference ref="collection_times"/>
             <reference ref="essential_wheelchair"/>
         </item> <!-- Parcel Locker -->
+        <item name="Post Depot" icon="icons/png/amenity_post_depot.png" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:amenity=post_depot"/>
+            <space/>
+            <key key="amenity" value="post_depot"/>
+            <reference ref="name_operator_oh_wheelchair_level"/>
+            <text key="ref" text="Reference number"/>
+            <reference ref="essential_wheelchair"/>
+        </item> <!-- Post Depot -->
         <item name="Telephone" icon="icons/png/amenity_telephone.png" type="node" preset_name_label="true">
             <link wiki="Tag:amenity=telephone"/>
             <space/>
@@ -7971,7 +8040,14 @@
                 <text key="post:city" text="City" match="key"/>
                 <text key="post:state" text="State" match="key"/>
             </optional>
-        </item> <!-- Weighbridge -->
+        </item> <!-- Letter box -->
+        <item name="Research institute" icon="icons/png/amenity_research.png" type="node,closedway,multipolygon">
+            <link wiki="Tag:amenity=research_institute"/>
+            <space/>
+            <key key="amenity" value="research_institute"/>
+            <reference ref="name_operator"/>
+            <reference ref="link_contact_address"/>
+        </item> <!-- Research institute -->
     </group> <!-- Facilities -->
     </group>  <!-- Facilities -->
     <group name="Sports" icon="icons/png/sport_soccer.png">
@@ -11523,6 +11599,14 @@
             <reference ref="name_oh_wheelchair"/>
             <reference ref="link_contact_address_payment"/>
         </item> <!-- Security -->
+       <item name="Repair" icon="icons/png/shopping_repair.png" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=repair"/>
+            <space/>
+            <key key="shop" value="repair"/>
+            <multiselect key="repair" values="assisted_self_service;appliance;computer;electronics;mobile_phone;motorcycle;shoes;tv;tyres" display_values="Assisted self service;Appliances;Computers;Electronics;Mobile phones;Motorcycles;Shoes;TVs;Tyres"/>
+            <reference ref="name_oh_wheelchair"/>
+            <reference ref="link_contact_address_payment"/>
+        </item> <!-- Repair -->
         <item name="Funeral Directors" icon="icons/png/shopping_funeral_directors_29067.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=funeral_directors"/>
             <space/>
@@ -11845,10 +11929,12 @@
             <space/>
             <key key="boundary" value="hazard"/>
             <combo key="hazard" text="Hazard" values_context="hazard">
+                <list_entry value="biohazard" short_description="Biohazard"/>
                 <list_entry value="contamination" short_description="Contamination"/>
                 <list_entry value="minefield" short_description="Minefield"/>
                 <list_entry value="nuclear" short_description="Nuclear"/>
                 <list_entry value="shooting_range" short_description="Shooting range"/>
+                <list_entry value="quicksand" short_description="Quicksand"/>
                 <list_entry value="unexploded_ordnance" short_description="Unexploded ordnance"/>
             </combo>
             <optional>
@@ -12123,11 +12209,11 @@
             <key key="natural" value="hot_spring"/>
             <reference ref="optional_name_wikipedia"/>
             <combo key="water_characteristic">
-            	<list_entry value="sulfuric" display_value="Contains sulfuric acid"/>
-            	<list_entry value="sulfurous" display_value="Contains sulfur"/>
-            	<list_entry value="mud" display_value="Mud"/>
+                <list_entry value="sulfuric" display_value="Contains sulfuric acid"/>
+                <list_entry value="sulfurous" display_value="Contains sulfur"/>
+                <list_entry value="mud" display_value="Mud"/>
             </combo>
-			<text key="temperature" text="Temperature (&#xB0;C)"/> 
+            <text key="temperature" text="Temperature (&#xB0;C)"/> 
         </item> <!-- Geyser -->
         <separator/>
         <item name="Island" icon="icons/png/poi_island.png" type="node,closedway,multipolygon" preset_name_label="true" name_context="place">
@@ -13898,6 +13984,13 @@
             <reference ref="name_oh_wheelchair_level"/>
             <reference ref="link_contact_address"/>
         </item> <!-- Estate agent -->
+        <item name="Property management" icon="icons/png/office_property_management.png" type="node,closedway,multipolygon">
+            <link wiki="Tag:office=property_management"/>
+            <space/>
+            <key key="office" value="property_management"/>
+            <reference ref="name_oh_wheelchair_level"/>
+            <reference ref="link_contact_address"/>
+        </item> <!-- Property management -->
         <item name="Government" icon="icons/png/office_government_25006.png" type="node,closedway,multipolygon">
             <link wiki="Tag:office=government"/>
             <space/>
@@ -13998,6 +14091,20 @@
             <reference ref="name_oh_wheelchair_level"/>
             <reference ref="link_contact_address"/>
         </item> <!-- Architect -->
+        <item name="Engineer" icon="icons/png/office_engineer.png" type="node,closedway,multipolygon">
+            <link wiki="Tag:office=engineer"/>
+            <space/>
+            <key key="office" value="engineer"/>
+            <reference ref="name_oh_wheelchair_level"/>
+            <reference ref="link_contact_address"/>
+        </item> <!-- Engineer -->
+        <item name="Construction company" icon="icons/png/office_construction_company.png" type="node,closedway,multipolygon">
+            <link wiki="Tag:office=construction_company"/>
+            <space/>
+            <key key="office" value="construction_company"/>
+            <reference ref="name_oh_wheelchair_level"/>
+            <reference ref="link_contact_address"/>
+        </item> <!-- Construction company -->
         <item name="Association" icon="icons/png/office_association_25025.png" type="node,closedway,multipolygon">
             <link wiki="Tag:office=association"/>
             <space/>
@@ -14071,6 +14178,13 @@
             <reference ref="name_oh_wheelchair_level"/>
             <reference ref="link_contact_address"/>
         </item> <!-- Tax advisor -->
+        <item name="Financial advisor" icon="icons/png/office_financial_advisor.png" type="node,closedway,multipolygon">
+            <link wiki="Tag:office=financial_advisor"/>
+            <space/>
+            <key key="office" value="financial_advisor"/>
+            <reference ref="name_oh_wheelchair_level"/>
+            <reference ref="link_contact_address"/>
+        </item> <!-- Financial advisor -->
         <item name="Consulting" icon="icons/png/office_consulting_25044.png" type="node,closedway,multipolygon">
             <link wiki="Tag:office=consulting"/>
             <space/>
@@ -14106,6 +14220,13 @@
             <reference ref="name_oh_wheelchair_level"/>
             <reference ref="link_contact_address"/>
         </item> <!-- Logistics -->
+        <item name="Courier" icon="icons/png/office_courier.png" type="node,closedway,multipolygon">
+            <link wiki="Tag:office=courier"/>
+            <space/>
+            <key key="office" value="courier"/>
+            <reference ref="name_oh_wheelchair_level"/>
+            <reference ref="link_contact_address"/>
+        </item> <!-- Courier -->
         <item name="Notary" icon="icons/png/office_notary_25049.png" type="node,closedway,multipolygon">
             <link wiki="Tag:office=notary"/>
             <space/>
@@ -14185,7 +14306,7 @@
             <!-- originalTags and tags are java.util.Map<String,ArrayList<String>>, originalTags are the tags
                  before the PropertyEditor was started, tags are the current values, by removing the key at the
                  end of the script it can be re-run without manually reseting the value, &, <, > need to be escaped -->
-            <text key="set_to_disused" javascript=" var objects = ['shop','amenity','leisure','military','man_made','tourism'];  function isObject(key) {   var objectsLength = objects.length;   for (var i = 0; i &lt; objectsLength; i++) {     if (objects[i].equals(key)) {             return true;     }   }   return false; }  for (var key in Iterator(new java.util.HashSet(tags.keySet()))) {   if (isObject(key)) {     tags.put('disused:'+key,tags.get(key));     tags.remove(key);   } } tags.remove('set_to_disused');"/>
+            <text key="set_to_disused" javascript=" var objects = ['amenity','aeroway','highway','leisure','man_made','military','railway','shop'];  function isObject(key) {   var objectsLength = objects.length;   for (var i = 0; i &lt; objectsLength; i++) {     if (objects[i].equals(key)) {             return true;     }   }   return false; }  for (var key in Iterator(new java.util.HashSet(tags.keySet()))) {   if (isObject(key)) {     tags.put('disused:'+key,tags.get(key));     tags.remove(key);   } } tags.remove('set_to_disused');"/>
         </item>
         <item name="Set to disused (remove tags)" icon="icons/png/javascript.png" type="node,way,closedway,relation" preset_name_label="true">
             <link wiki="Key:disused:"/>
@@ -14193,22 +14314,83 @@
                  originalTags and tags are java.util.Map<String,ArrayList<String>>, originalTags are the tags
                  before the PropertyEditor was started, tags are the current values, by removing the key at the
                  end of the script it can be re-run without manually reseting the value, &, <, > need to be escaped -->
-            <text key="set_to_disused_remove_tags" javascript=" var objects = ['shop','amenity','leisure','military'];  function isObject(key) {   var objectsLength = objects.length;   for (var i = 0; i &lt; objectsLength; i++) {     if (objects[i].equals(key)) {             return true;     }   }   return false; }  var presetItem = null; for (var key in Iterator(new java.util.HashSet(tags.keySet()))) {   if (isObject(key)) {     tags.put('disused:'+key,tags.get(key));     presetItem = key2PresetItem.get(key);     tags.remove(key);   }   if (typeof versionCode !== 'undefined' &amp;&amp; versionCode &gt; 703) {     if (presetItem !== null &amp;&amp; presetItem.equals(key2PresetItem.get(key))) {       tags.remove(key);     }   } } tags.remove('set_to_disused_remove_tags');"/>
+            <text key="set_to_disused_remove_tags" javascript=" var objects = ['amenity','aeroway','highway','leisure','man_made','military','railway','shop'];  function isObject(key) {   var objectsLength = objects.length;   for (var i = 0; i &lt; objectsLength; i++) {     if (objects[i].equals(key)) {             return true;     }   }   return false; }  var presetItem = null; for (var key in Iterator(new java.util.HashSet(tags.keySet()))) {   if (isObject(key)) {     tags.put('disused:'+key,tags.get(key));     presetItem = key2PresetItem.get(key);     tags.remove(key);   }   if (typeof versionCode !== 'undefined' &amp;&amp; versionCode &gt; 703) {     if (presetItem !== null &amp;&amp; presetItem.equals(key2PresetItem.get(key))) {       tags.remove(key);     }   } } tags.remove('set_to_disused_remove_tags');"/>
         </item>
         <item name="Disused amenity" icon="icons/png/lifecycle.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Key:disused:"/>
             <space/>
             <text key="disused:amenity" match="key"/>
         </item> <!-- Disused amenity -->
+        <item name="Disused aeroway" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:disused:"/>
+            <space/>
+            <text key="disused:aeroway" match="key"/>
+        </item> <!-- Disused aeroway -->
+        <item name="Disused building" icon="icons/png/lifecycle.png" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:disused:"/>
+            <space/>
+            <text key="disused:building" match="key"/>
+        </item> <!-- Disused building --> 
+        <item name="Disused highway" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:disused:"/>
+            <space/>
+            <text key="disused:highway" match="key"/>
+        </item> <!-- Disused highway -->
         <item name="Disused leisure" icon="icons/png/lifecycle.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Key:disused:"/>
             <space/>
             <text key="disused:leisure" match="key"/>
         </item> <!-- Disused leisure -->
+        <item name="Disused military object" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:disused:"/>
+            <space/>
+            <text key="disused:military" match="key"/>
+        </item> <!-- Disused military object -->
+        <item name="Disused railway" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:disused:"/>
+            <space/>
+            <text key="disused:railway" match="key"/>
+        </item> <!-- Disused railway -->
         <item name="Disused shop" icon="icons/png/lifecycle.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Key:disused:"/>
             <space/>
             <text key="disused:shop" match="key"/>
         </item> <!-- Disused shop -->
+        <separator/>
+        <item name="Set to abandoned" icon="icons/png/javascript.png" type="node,way,closedway,relation" preset_name_label="true">
+            <link wiki="Key:abandoned:"/>
+            <!-- originalTags and tags are java.util.Map<String,ArrayList<String>>, originalTags are the tags
+                 before the PropertyEditor was started, tags are the current values, by removing the key at the
+                 end of the script it can be re-run without manually reseting the value, &, <, > need to be escaped -->
+            <text key="set_to_abandoned" javascript=" var objects = ['amenity','aeroway','highway','leisure','man_made','military','railway','shop'];  function isObject(key) {   var objectsLength = objects.length;   for (var i = 0; i &lt; objectsLength; i++) {     if (objects[i].equals(key)) {             return true;     }   }   return false; }  for (var key in Iterator(new java.util.HashSet(tags.keySet()))) {   if (isObject(key)) {     tags.put('abandoned:'+key,tags.get(key));     tags.remove(key);   } } tags.remove('set_to_abandoned');"/>
+        </item>
+        <item name="Set to abandoned (remove tags)" icon="icons/png/javascript.png" type="node,way,closedway,relation" preset_name_label="true">
+            <link wiki="Key:abandoned:"/>
+            <!-- This preset will only remove tags on app version 703 and higher (Vespucci 11.1.1)
+                 originalTags and tags are java.util.Map<String,ArrayList<String>>, originalTags are the tags
+                 before the PropertyEditor was started, tags are the current values, by removing the key at the
+                 end of the script it can be re-run without manually reseting the value, &, <, > need to be escaped -->
+            <text key="set_to_abandoned_remove_tags" javascript=" var objects = ['amenity','aeroway','highway','leisure','man_made','military','railway','shop'];  function isObject(key) {   var objectsLength = objects.length;   for (var i = 0; i &lt; objectsLength; i++) {     if (objects[i].equals(key)) {             return true;     }   }   return false; }  var presetItem = null; for (var key in Iterator(new java.util.HashSet(tags.keySet()))) {   if (isObject(key)) {     tags.put('abandoned:'+key,tags.get(key));     presetItem = key2PresetItem.get(key);     tags.remove(key);   }   if (typeof versionCode !== 'undefined' &amp;&amp; versionCode &gt; 703) {     if (presetItem !== null &amp;&amp; presetItem.equals(key2PresetItem.get(key))) {       tags.remove(key);     }   } } tags.remove('set_to_abandoned_remove_tags');"/>
+        </item>
+        <item name="Abandoned aeroway" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:abandoned:"/>
+            <space/>
+            <text key="abandoned:aeroway" match="key"/>
+        </item> <!-- Abandoned aeroway -->
+        <item name="Abandoned building" icon="icons/png/lifecycle.png" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:abandoned:"/>
+            <space/>
+            <text key="abandoned:building" match="key"/>
+        </item> <!-- Abandoned building -->
+        <item name="Abandoned highway" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:abandoned:"/>
+            <space/>
+            <text key="abandoned:highway" match="key"/>
+        </item> <!-- Abandoned highway -->
+        <item name="Abandoned railway" icon="icons/png/lifecycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:abandoned:"/>
+            <space/>
+            <text key="abandoned:railway" match="key"/>
+        </item> <!-- Abandoned railway -->
     </group>
 </presets>
diff --git a/taginfo.json b/taginfo.json
index 8c4426cc80..9cd12d3215 100644
--- a/taginfo.json
+++ b/taginfo.json
@@ -3365,6 +3365,8 @@
 {"description":"Highways/Barriers/Handrail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "colour","object_types": ["way","area"]},
 {"description":"Highways/Barriers/Cable barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "barrier","value": "cable_barrier","object_types": ["way","area"]},
 {"description":"Highways/Barriers/Cable barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "height","object_types": ["way","area"]},
+{"description":"Highways/Barriers/Rope","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_rope_13030.png","key": "barrier","value": "rope","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Rope","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_rope_13030.png","key": "height","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Wall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_wall.png","key": "barrier","value": "wall","object_types": ["way","area"]},
 {"description":"Highways/Barriers/Wall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_wall.png","key": "wall","value": "brick","object_types": ["way","area"]},
 {"description":"Highways/Barriers/Wall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_wall.png","key": "wall","value": "castle_wall","object_types": ["way","area"]},
@@ -4916,7 +4918,9 @@
 {"description":"Water/Shipping/Ferry Terminal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_ferry_terminal_12048.png","key": "cargo","value": "vehicle","object_types": ["node","area"]},
 {"description":"Water/Shipping/Ferry Terminal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_ferry_terminal_12048.png","key": "cargo","value": "bicycle","object_types": ["node","area"]},
 {"description":"Water/Shipping/Ferry Terminal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_ferry_terminal_12048.png","key": "cargo","value": "hgv","object_types": ["node","area"]},
-{"description":"Water/Shipping/Ferry Terminal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_ferry_terminal_12048.png","key": "cargo","value": "passengers;vehicle","object_types": ["node","area"]},
+{"description":"Water/Shipping/Ferry Terminal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_ferry_terminal_12048.png","key": "cargo","value": "container","object_types": ["node","area"]},
+{"description":"Water/Shipping/Ferry Terminal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_ferry_terminal_12048.png","key": "cargo","value": "dry_bulk","object_types": ["node","area"]},
+{"description":"Water/Shipping/Ferry Terminal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_ferry_terminal_12048.png","key": "cargo","value": "liquid_bulk","object_types": ["node","area"]},
 {"description":"Water/Shipping/Ferry Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_route_sp.png","key": "route","value": "ferry","object_types": ["way","relation","area"]},
 {"description":"Water/Shipping/Ferry Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_route_sp.png","key": "name","object_types": ["way","relation","area"]},
 {"description":"Water/Shipping/Ferry Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_route_sp.png","key": "ref","object_types": ["way","relation","area"]},
@@ -4960,6 +4964,9 @@
 {"description":"Water/Shipping/Marina","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_marina.png","key": "leisure","value": "marina","object_types": ["node","area"]},
 {"description":"Water/Shipping/Marina","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_marina.png","key": "name","object_types": ["node","area"]},
 {"description":"Water/Shipping/Marina","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_marina.png","key": "sanitary_dump_station","object_types": ["node","area"]},
+{"description":"Water/Shipping/Harbour","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_marina.png","key": "harbour","value": "yes","object_types": ["node","area"]},
+{"description":"Water/Shipping/Harbour","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_marina.png","key": "name","object_types": ["node","area"]},
+{"description":"Water/Shipping/Harbour","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_marina.png","key": "operator","object_types": ["node","area"]},
 {"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "waterway","value": "fuel","object_types": ["node","area"]},
 {"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "brand","value": "Agip","object_types": ["node","area"]},
 {"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "brand","value": "Aral","object_types": ["node","area"]},
@@ -5040,6 +5047,13 @@
 {"description":"Water/Shipping/Pier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_pier_22046.png","key": "mooring","value": "permit","object_types": ["node","way","area"]},
 {"description":"Water/Shipping/Pier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_pier_22046.png","key": "mooring","value": "commercial","object_types": ["node","way","area"]},
 {"description":"Water/Shipping/Pier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_pier_22046.png","key": "floating","object_types": ["node","way","area"]},
+{"description":"Water/Shipping/Quay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_quay.png","key": "man_made","value": "quay","object_types": ["way","area"]},
+{"description":"Water/Shipping/Quay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_quay.png","key": "name","object_types": ["way","area"]},
+{"description":"Water/Shipping/Quay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_quay.png","key": "mooring","value": "yes","object_types": ["way","area"]},
+{"description":"Water/Shipping/Quay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_quay.png","key": "mooring","value": "no","object_types": ["way","area"]},
+{"description":"Water/Shipping/Quay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_quay.png","key": "mooring","value": "private","object_types": ["way","area"]},
+{"description":"Water/Shipping/Quay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_quay.png","key": "mooring","value": "permit","object_types": ["way","area"]},
+{"description":"Water/Shipping/Quay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_quay.png","key": "mooring","value": "commercial","object_types": ["way","area"]},
 {"description":"Water/Shipping/Lock Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_lock_gate_34007.png","key": "waterway","value": "lock_gate","object_types": ["node","way"]},
 {"description":"Water/Shipping/Turning Point","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_turning_point_34023.png","key": "waterway","value": "turning_point","object_types": ["node"]},
 {"description":"Water/Shipping/Slipway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_slipway.png","key": "leisure","value": "slipway","object_types": ["node"]},
@@ -9051,8 +9065,10 @@
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:climbingwall","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:cushion","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:exercise","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:funnel_ball","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:hopscotch","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:horizontal_bar","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:map","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:multi_play","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:playhouse","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:roundabout","object_types": ["node","area"]},
@@ -9087,8 +9103,10 @@
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "climbingwall","object_types": ["node","way","area"]},
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "cushion","object_types": ["node","way","area"]},
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "exercise","object_types": ["node","way","area"]},
+{"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "funnel_ball","object_types": ["node","way","area"]},
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "hopscotch","object_types": ["node","way","area"]},
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "horizontal_bar","object_types": ["node","way","area"]},
+{"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "map","object_types": ["node","way","area"]},
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "multi_play","object_types": ["node","way","area"]},
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "playhouse","object_types": ["node","way","area"]},
 {"description":"Facilities/Leisure/Playground equipment/Playground equipment","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_slide_30043.png","key": "playground","value": "roundabout","object_types": ["node","way","area"]},
@@ -9782,14 +9800,15 @@
 {"description":"Facilities/Culture/Arts Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_arts_centre_12001.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "tourism","value": "artwork","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "architecture","object_types": ["node","way","area"]},
+{"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "bust","object_types": ["node","way","area"]},
+{"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "graffiti","object_types": ["node","way","area"]},
+{"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "installation","object_types": ["node","way","area"]},
+{"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "mosaic","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "mural","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "painting","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "sculpture","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "statue","object_types": ["node","way","area"]},
-{"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "bust","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "stone","object_types": ["node","way","area"]},
-{"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "installation","object_types": ["node","way","area"]},
-{"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_type","value": "graffiti","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "name","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artwork_subject","object_types": ["node","way","area"]},
 {"description":"Facilities/Culture/Artwork","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_artwork_30002.png","key": "artist_name","object_types": ["node","way","area"]},
@@ -11806,6 +11825,7 @@
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "10pin","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "9pin","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "american_football","object_types": ["node","area"]},
+{"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "american_handball","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "archery","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "athletics","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "australian_football","object_types": ["node","area"]},
@@ -11828,6 +11848,7 @@
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "equestrian","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "field_hockey","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "fitness","object_types": ["node","area"]},
+{"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "four_square","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "free_flying","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "futsal","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "gaelic_games","object_types": ["node","area"]},
@@ -11848,6 +11869,7 @@
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "netball","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "orienteering","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "padel","object_types": ["node","area"]},
+{"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "paintball","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "pelota","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "pickleball","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "racquet","object_types": ["node","area"]},
@@ -11868,8 +11890,10 @@
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "speedway","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "swimming","object_types": ["node","area"]},
+{"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "table_soccer","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "table_tennis","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "tennis","object_types": ["node","area"]},
+{"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "teatherball","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "volleyball","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "sport","value": "yoga","object_types": ["node","area"]},
 {"description":"Facilities/Clubs/Sport club","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_club_sport_35059.png","key": "name","object_types": ["node","area"]},
@@ -12086,7 +12110,6 @@
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "changing_table:location","value": "sales_area","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "operator","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "toilets:position","value": "seated","object_types": ["node","area"]},
-{"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "toilets:position","value": "seated;urinal","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "toilets:position","value": "squat","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "toilets:position","value": "urinal","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "opening_hours","object_types": ["node","area"]},
@@ -12112,6 +12135,22 @@
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "level","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "amenity","value": "dressing_room","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "access","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "female","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "male","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "unisex","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "locker","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "description","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "fee","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "operator","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "supervised","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Dressing room","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_dressing_room.png","key": "level","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Smoking area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_tobacco_29141.png","key": "amenity","value": "smoking_area","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Smoking area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_tobacco_29141.png","key": "access","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Smoking area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_tobacco_29141.png","key": "level","object_types": ["node","area"]},
@@ -12137,6 +12176,16 @@
 {"description":"Facilities/Facilities/Parcel Locker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_parcel_locker.png","key": "colour","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Parcel Locker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_parcel_locker.png","key": "collection_times","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Parcel Locker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_parcel_locker.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "amenity","value": "post_depot","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "name","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "operator","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "level","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Post Depot","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_depot.png","key": "ref","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Telephone","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_telephone.png","key": "amenity","value": "telephone","object_types": ["node"]},
 {"description":"Facilities/Facilities/Telephone","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_telephone.png","key": "operator","object_types": ["node"]},
 {"description":"Facilities/Facilities/Telephone","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_telephone.png","key": "covered","value": "yes","object_types": ["node"]},
@@ -12552,11 +12601,15 @@
 {"description":"Facilities/Facilities/Letter box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_letter_box.png","key": "post:postcode","object_types": ["node","way"]},
 {"description":"Facilities/Facilities/Letter box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_letter_box.png","key": "post:city","object_types": ["node","way"]},
 {"description":"Facilities/Facilities/Letter box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_letter_box.png","key": "post:state","object_types": ["node","way"]},
+{"description":"Facilities/Facilities/Research institute","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_research.png","key": "amenity","value": "research_institute","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Research institute","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_research.png","key": "name","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Research institute","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_research.png","key": "operator","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "leisure","value": "stadium","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "name","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "10pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "9pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "american_football","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "american_handball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "archery","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "athletics","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "australian_football","object_types": ["node","area"]},
@@ -12579,6 +12632,7 @@
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "equestrian","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "field_hockey","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "fitness","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "four_square","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "free_flying","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "futsal","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "gaelic_games","object_types": ["node","area"]},
@@ -12599,6 +12653,7 @@
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "netball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "orienteering","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "padel","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "paintball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "pelota","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "pickleball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "racquet","object_types": ["node","area"]},
@@ -12619,8 +12674,10 @@
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "speedway","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "swimming","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "table_soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "table_tennis","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "tennis","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "teatherball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "volleyball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Stadium","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_stadium.png","key": "sport","value": "yoga","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "leisure","value": "sports_centre","object_types": ["node","area"]},
@@ -12628,6 +12685,7 @@
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "10pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "9pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "american_football","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "american_handball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "archery","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "athletics","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "australian_football","object_types": ["node","area"]},
@@ -12650,6 +12708,7 @@
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "equestrian","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "field_hockey","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "fitness","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "four_square","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "free_flying","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "futsal","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "gaelic_games","object_types": ["node","area"]},
@@ -12670,6 +12729,7 @@
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "netball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "orienteering","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "padel","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "paintball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "pelota","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "pickleball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "racquet","object_types": ["node","area"]},
@@ -12690,8 +12750,10 @@
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "speedway","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "swimming","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "table_soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "table_tennis","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "tennis","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "teatherball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "volleyball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_empty.png","key": "sport","value": "yoga","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "leisure","value": "sports_hall","object_types": ["node","area"]},
@@ -12699,6 +12761,7 @@
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "10pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "9pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "american_football","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "american_handball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "archery","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "athletics","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "australian_football","object_types": ["node","area"]},
@@ -12721,6 +12784,7 @@
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "equestrian","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "field_hockey","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "fitness","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "four_square","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "free_flying","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "futsal","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "gaelic_games","object_types": ["node","area"]},
@@ -12741,6 +12805,7 @@
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "netball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "orienteering","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "padel","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "paintball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "pelota","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "pickleball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "racquet","object_types": ["node","area"]},
@@ -12761,8 +12826,10 @@
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "speedway","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "swimming","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "table_soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "table_tennis","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "tennis","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "teatherball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "volleyball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Sports Hall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_hall.png","key": "sport","value": "yoga","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "leisure","value": "fitness_centre","object_types": ["node","area"]},
@@ -12770,6 +12837,7 @@
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "10pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "9pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "american_football","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "american_handball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "archery","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "athletics","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "australian_football","object_types": ["node","area"]},
@@ -12792,6 +12860,7 @@
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "equestrian","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "field_hockey","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "fitness","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "four_square","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "free_flying","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "futsal","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "gaelic_games","object_types": ["node","area"]},
@@ -12812,6 +12881,7 @@
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "netball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "orienteering","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "padel","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "paintball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "pelota","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "pickleball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "racquet","object_types": ["node","area"]},
@@ -12832,8 +12902,10 @@
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "speedway","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "swimming","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "table_soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "table_tennis","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "tennis","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "teatherball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "volleyball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "sport","value": "yoga","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Fitness Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gym.png","key": "level","object_types": ["node","area"]},
@@ -12849,6 +12921,7 @@
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "10pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "9pin","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "american_football","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "american_handball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "archery","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "athletics","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "australian_football","object_types": ["node","area"]},
@@ -12871,6 +12944,7 @@
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "equestrian","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "field_hockey","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "fitness","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "four_square","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "free_flying","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "futsal","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "gaelic_games","object_types": ["node","area"]},
@@ -12891,6 +12965,7 @@
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "netball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "orienteering","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "padel","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "paintball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "pelota","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "pickleball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "racquet","object_types": ["node","area"]},
@@ -12911,8 +12986,10 @@
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "speedway","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "swimming","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "table_soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "table_tennis","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "tennis","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "teatherball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "volleyball","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "sport","value": "yoga","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_pitch_21033.png","key": "surface","object_types": ["node","area"]},
@@ -19817,6 +19894,7 @@
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "10pin","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "9pin","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "american_football","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "american_handball","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "archery","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "athletics","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "australian_football","object_types": ["node","area"]},
@@ -19839,6 +19917,7 @@
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "equestrian","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "field_hockey","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "fitness","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "four_square","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "free_flying","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "futsal","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "gaelic_games","object_types": ["node","area"]},
@@ -19859,6 +19938,7 @@
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "netball","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "orienteering","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "padel","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "paintball","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "pelota","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "pickleball","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "racquet","object_types": ["node","area"]},
@@ -19879,8 +19959,10 @@
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "speedway","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "swimming","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "table_soccer","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "table_tennis","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "tennis","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "teatherball","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "volleyball","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "sport","value": "yoga","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sports","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_sports_29129.png","key": "name","object_types": ["node","area"]},
@@ -20451,6 +20533,22 @@
 {"description":"Shops/Other/Security","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_surveillance_22063.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Shops/Other/Security","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_surveillance_22063.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Security","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_surveillance_22063.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "shop","value": "repair","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "assisted_self_service","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "appliance","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "computer","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "electronics","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "mobile_phone","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "motorcycle","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "shoes","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "tv","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "repair","value": "tyres","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "name","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Shops/Other/Repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_repair.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Funeral Directors","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_funeral_directors_29067.png","key": "shop","value": "funeral_directors","object_types": ["node","area"]},
 {"description":"Shops/Other/Funeral Directors","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_funeral_directors_29067.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Funeral Directors","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_funeral_directors_29067.png","key": "opening_hours","object_types": ["node","area"]},
@@ -20804,10 +20902,12 @@
 {"description":"Geography/Boundaries/Protected Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/boundaries.png","key": "wikimedia_commons","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Protected Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/boundaries.png","key": "start_date","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "boundary","value": "hazard","object_types": ["relation","area"]},
+{"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "hazard","value": "biohazard","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "hazard","value": "contamination","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "hazard","value": "minefield","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "hazard","value": "nuclear","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "hazard","value": "shooting_range","object_types": ["relation","area"]},
+{"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "hazard","value": "quicksand","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "hazard","value": "unexploded_ordnance","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Hazardous Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/ISO_7010_W001.png","key": "related_law","object_types": ["relation","area"]},
 {"description":"Geography/Boundaries/Maritime","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_marina_21018.png","key": "boundary","value": "maritime","object_types": ["way","relation","area"]},
@@ -23040,6 +23140,14 @@
 {"description":"Offices/Estate agent","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_estate_agent_25005.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Offices/Estate agent","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_estate_agent_25005.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Estate agent","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_estate_agent_25005.png","key": "level","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "office","value": "property_management","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "name","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Offices/Property management","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_property_management.png","key": "level","object_types": ["node","area"]},
 {"description":"Offices/Government","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "office","value": "government","object_types": ["node","area"]},
 {"description":"Offices/Government","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "name","object_types": ["node","area"]},
 {"description":"Offices/Government","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "government","value": "administrative","object_types": ["node","area"]},
@@ -23178,6 +23286,22 @@
 {"description":"Offices/Architect","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_architect_25024.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Offices/Architect","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_architect_25024.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Architect","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_architect_25024.png","key": "level","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "office","value": "engineer","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "name","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Offices/Engineer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_engineer.png","key": "level","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "office","value": "construction_company","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "name","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Offices/Construction company","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_construction_company.png","key": "level","object_types": ["node","area"]},
 {"description":"Offices/Association","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_association_25025.png","key": "office","value": "association","object_types": ["node","area"]},
 {"description":"Offices/Association","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_association_25025.png","key": "name","object_types": ["node","area"]},
 {"description":"Offices/Association","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_association_25025.png","key": "opening_hours","object_types": ["node","area"]},
@@ -23257,6 +23381,14 @@
 {"description":"Offices/Tax advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_tax_advisor_25043.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Offices/Tax advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_tax_advisor_25043.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Tax advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_tax_advisor_25043.png","key": "level","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "office","value": "financial_advisor","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "name","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Offices/Financial advisor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_financial_advisor.png","key": "level","object_types": ["node","area"]},
 {"description":"Offices/Consulting","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_consulting_25044.png","key": "office","value": "consulting","object_types": ["node","area"]},
 {"description":"Offices/Consulting","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_consulting_25044.png","key": "name","object_types": ["node","area"]},
 {"description":"Offices/Consulting","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_consulting_25044.png","key": "opening_hours","object_types": ["node","area"]},
@@ -23297,6 +23429,14 @@
 {"description":"Offices/Logistics","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_logistics_25048.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Offices/Logistics","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_logistics_25048.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Logistics","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_logistics_25048.png","key": "level","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "office","value": "courier","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "name","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "opening_hours","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "wheelchair","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "wheelchair:description","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Offices/Courier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_courier.png","key": "level","object_types": ["node","area"]},
 {"description":"Offices/Notary","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_notary_25049.png","key": "office","value": "notary","object_types": ["node","area"]},
 {"description":"Offices/Notary","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_notary_25049.png","key": "name","object_types": ["node","area"]},
 {"description":"Offices/Notary","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_notary_25049.png","key": "opening_hours","object_types": ["node","area"]},
@@ -23435,6 +23575,15 @@
 {"description":"Offices/Vacant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_vacant_25055.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Vacant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_vacant_25055.png","key": "level","object_types": ["node","area"]},
 {"description":"Lifecycle/Disused amenity","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:amenity","object_types": ["node","area"]},
+{"description":"Lifecycle/Disused aeroway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:aeroway","object_types": ["node","way","area"]},
+{"description":"Lifecycle/Disused building","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:building","object_types": ["node","area"]},
+{"description":"Lifecycle/Disused highway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:highway","object_types": ["node","way","area"]},
 {"description":"Lifecycle/Disused leisure","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:leisure","object_types": ["node","area"]},
-{"description":"Lifecycle/Disused shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:shop","object_types": ["node","area"]}
+{"description":"Lifecycle/Disused military object","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:military","object_types": ["node","way","area"]},
+{"description":"Lifecycle/Disused railway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:railway","object_types": ["node","way","area"]},
+{"description":"Lifecycle/Disused shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "disused:shop","object_types": ["node","area"]},
+{"description":"Lifecycle/Abandoned aeroway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "abandoned:aeroway","object_types": ["node","way","area"]},
+{"description":"Lifecycle/Abandoned building","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "abandoned:building","object_types": ["node","area"]},
+{"description":"Lifecycle/Abandoned highway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "abandoned:highway","object_types": ["node","way","area"]},
+{"description":"Lifecycle/Abandoned railway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/lifecycle.png","key": "abandoned:railway","object_types": ["node","way","area"]}
 ]}