From 64950e0c51e13c7e8d58eb2e2e24f55143435358 Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Sun, 8 Oct 2023 15:11:19 +0200
Subject: [PATCH] Update preset and taginfo project file

---
 .../images/icons/png/natural_spring_24010.png | Bin 0 -> 2417 bytes
 src/main/assets/preset.xml                    |  28 +-
 taginfo.json                                  | 970 ++++++++++++++++--
 3 files changed, 933 insertions(+), 65 deletions(-)
 create mode 100644 src/main/assets/images/icons/png/natural_spring_24010.png

diff --git a/src/main/assets/images/icons/png/natural_spring_24010.png b/src/main/assets/images/icons/png/natural_spring_24010.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1fa85add047273e9af3f30d8364ba0d82596646
GIT binary patch
literal 2417
zcmV-%36A!OP)<h;3K|Lk000e1NJLTq001ul001xu1^@s6fu|$l00006VoOIv0RI60
z0RN!9r;`8x2_{KIK~!jg)tO6dTU8pzf9LuU`^HIJ$2BBzLptEpEs2`a;I?rSsuGl>
zqEZpGAcWK<tC2>U+0F`SR<mLUD=HT40u3O95Gc?GYDw#=0jZQWt&*FkLsEz4I<cMW
z<epiS+{vvUam%2>f9LOf=R5y%?m6Gf0zgVB-hco7zXAQgQ$h%jlyZ$f4xGS>5Mtak
z&A~t*@b42RPOOPviJt~e0OB!|tQ7xACX>e<4Gj%{6+--jKM!$$XiZJcf+B<%;Lk-I
zKnNlF6yPt9o5>?$y8`$gH;YGsl+vdF%EL?w1OkLYApq*@>xso;cs!m*CgFCwEqf0M
z@leEt5WMorD;zm;1b|2+LPtjj;cyrLpRcly*wD~GFc<`&v$K<9$BwaW+qQ?H0)XS_
z(W8F{YRV}!H#f6w+cxIr=E!EV+`4rOUDuhJnPGZ*nyINNB9RD3j~*qRPLoQdO4{;x
zJRCoM9KYYs$jAtbi;L*Gj;3j-s>-XczKUTOWo`Tl-C4;FySuw_I2>HRew~{)Z(4HG
zG)X3t03?%1rl+S_US2M1E0@c0;lc%Lp04X$zkVHnd_K?G+8VXBwUy99y!YOFGeAQ*
zrKYAPve_&P3kww)?d<GiVPS#M(NRmbbLUQW?AXC)pMA#K+UCLA>2#tf3Wi~nQkg1w
z@<Isu`ua$vQX~?Iib$`|+qG*K*=*KEzM-K3kH>>)nibhOeE2ZIV35<NPa~x)s#B7@
z%jKf6v5`zBQ!#M>DJ7qO{y9R}<KEe`XHgWTB#{T9X&Q>6AcQD6r|h*+Rh3*WSMh0W
zL{(K4?d|Q1jEoSCM)~1~A6Qvgd1yOjFjdr5Ha9oZ+uMs_7!?r@g+jdc+G{-X%rlm(
zp`n52o_mg1EJjC12le&!*4T?LzQ~ayM+&~qgAhW{-`{VuyAegnM<NkgT3T>A%R8g$
z>T2M=`}6sHxLhs(T3cJub)7^aK_Zdh+_`gjJRZxpd%a$2YHDye95@_~l0i-gK`0a|
z83T%58&y@QuC8W&e!e8}Xf#SsPY+*y`6c7y<Cfg*c60LNN#^J0`Q(#N@OV5_RaNo&
z>#w6}8ee_&mCepeFTF%lQxj*-oFSLX6|AGGD*1e#d_Mo+P@%WkvSkZiua}vbnUcf-
z48vf4exAE`?-t0<pFfXb7<6=W5R1jQaNz=1uU=(rY^=bJrfJmF)RcUbnM?+s&xh0L
zB%96J#tO(EI&_G-x;j4i;DfT{M@L6(u5cqpMn(W=Yik4U2eWI}t`*h2efu`IZ{IGv
zR)2p#`Fx&FKmD{k`I|Ry;&3=h8gjec3=9nL<Bvab=gyt7i>^oH)z#IqdH}t>z1+KZ
zkE>U&7L47wbH{p5Wy$~a(@$j=aXOs@0s*{U@1}&@ZZ|K#{4!UrTw!Wzs;q8ZU0q4<
z^ZobV7w59^M_XGPZEbCQ^wCEpPb-tj@ZpCaR&<(8O-%%YL88&<rsO~V_~WwUZEbDL
z&d%E2n9WrxN@W>xCBy;7#>V*On{POO{`{u8rfHUpDT<;Hi^bTrYnM%4QDXK-Krk32
zolb9z(#0d}{|l<B^2Qr)SjEb3!QH!e3(|{C$rpP>mCBq>CqAFAAcFoDn;TJ<d>{~@
zx3||O3xz@)I&{b;3x~tR<MD#|x~_BT)G3=wU3axrRaKVE>-91)FknkZYHDie>+37~
z4$G21c<>;XFJJzjvZ4@=$89o~%S9{}<I0sQMQuFzxcBYb$Bi2|Y*!#2k25?xY}4)T
z?k15)luZmvk`Dv|=(>)s>z3@vC!b_?cGi~Thr?ksO)FaQ_<TN2o;*oQOAB!S8f@LV
z6;0DD9hb|6s;X952>0KLX_}kXu_ehDD;$ay28yCQQodi7RE0%LN%E;wit6fW{C>YB
zOD2<S-MZD*;+UA2pt-rZXvAGwTH@5HQ`SjKDM==iJpJ_3mQFsON7r?mM_O81!ZgiI
z`#EJ>ACr@lbai!+&1Olb(?}_qnwp}!yBl5CSzcbYItV>IJuECN6l8ubm&^8LW@cvC
zxpOCVb#=_m%~|X0*|P_?+ihKy$;nA#u^3WH?%lgrjGkVW{Oal|V`F2)VlgtA3`<K(
z<nwtnO(PzUTVz*OR+yNW;Dr}nV0L!ay8pGcwY>G#Tcp!ztMeeGWO8zna5zkTeLZt?
zb4V%CG>z8QR=i#>3kwUFrirF$?B2Z_DJ6@Giv{F2_4B4_GBh+qM@NTkQ;9@^-Me>N
zGQ%(!9v-H>z1^mlPNxgL2Eg#}Fs-evHreINm#s8<eWRByU9zpc5fwF^48tf$Nmo`@
z3S<xJWilDgoH<j}rj!yXrR~9+rdbe}R##U`rsx%=2a!mGiHQlDthKeZsBB|N2>0D(
zu}B#V2Cav=j;5xj0{6Im`}UGm-KOLNfdDNnEmlho;E5-mAQTF5>((tx77m9|Rn_Lh
z{eC}hzWF9QcI>d(tg5Qwz<~n{4Gmc`RaM!$cdsqj)z;SX?6c1@JUsmH<o$j>`}gl>
zaB$FS(FKD+_Uzfi;NYO;iyIpoiAJNGJ$u$RKbOn#^UpuqyoJ;0q_?-1ix)4FPN%KS
z96o%QbLY-k@1wf9nx38>zW(~_k}bcocRn7E^X<3aTA^GBL04B7gM))sD0e!YJpcUj
zeDTE>1wF`IE>}=@c6N4h<HikJ-*f-|{am|t%@)nOy1Ez|8Y<hdD|zx>uNNt$&0t+!
z9m~thHiN-nkW?yF@^nI>knO=WHZ~S?5rV;>?OrR2g3sqG=uA{h-Y^W@ZnrI~%Vx7y
zqiG#WOG_nN(p$D{;n=ZbHkX*qW()p=$mjF6wAnOGq?DUBy-EftDJ3f_E3~(_TOMR>
zZ4D_Ukx0a<Ne#om<M9v<hi%E#`k0iG(a}-s%cN2%4jeeZ<m9Av&3^gi7xwMj$N2cT
z<$ZKrXYby<jE|3(%5(Hh%Rsl=U2r8TmHo~(rxc(t{B1z7$(71}XPa3?2r*sps(&B|
zA*L16G%r1FB9Dmg6jfE<0sd?o_|EV5|4RV8`|i87E|=>aA;du;L>PGVe}#WP<bWwD
j<wYUHKi_`)?Zy8BIFlzO-W6L}00000NkvXXu0mjfLjJNJ

literal 0
HcmV?d00001

diff --git a/src/main/assets/preset.xml b/src/main/assets/preset.xml
index 880c545824..c337d88d89 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.19.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.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">
 <!--
     Icons have been derived from mainly from
   
@@ -266,7 +266,7 @@
     <chunk id="highway_public_transport">
         <check key="trolley_wire" text="Overhead trolley wires" disable_off="true"/>
         <combo key="embedded_rails" text="Embedded rails">
-           <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narroe guage"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
+           <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narrow gauge"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
         </combo>
     </chunk>
     <chunk id="crossing_type">    
@@ -1667,6 +1667,7 @@
         <checkgroup text="Accepted material" columns="4">
             <check key="recycling:aluminium" text="Aluminium" disable_off="true"/>
             <check key="recycling:batteries" text="Batteries" disable_off="true"/>
+            <check key="recycling:beverage_cartons" text="Beverage cartons" disable_off="true"/>
             <check key="recycling:cans" text="Cans" disable_off="true"/>
             <check key="recycling:cardboard" text="Cardboard" disable_off="true"/>
             <check key="recycling:clothes" text="Clothes" disable_off="true"/>
@@ -2261,7 +2262,7 @@
                         <list_entry value="yes" short_description="Yes"/><list_entry value="designated" short_description="Designated"/><list_entry value="no" short_description="No"/>
                     </multiselect>
                     <multiselect key="embedded_rails:lanes" text="Lanes with rails" delimiter="|" match="key" editable="true">
-                        <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narroe guage"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
+                        <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narrow gauge"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
                     </multiselect>
                 </optional>
             </item> <!-- Single direction roads -->
@@ -2294,7 +2295,7 @@
                        <list_entry value="yes" short_description="Yes"/><list_entry value="designated" short_description="Designated"/><list_entry value="no" short_description="No"/>
                     </multiselect>
                     <multiselect key="embedded_rails:lanes:forward" text="Lanes with rails" delimiter="|" match="key" editable="true">
-                        <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narroe guage"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
+                        <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narrow gauge"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
                     </multiselect>
                 </optional>
                 <!-- backwards -->
@@ -2321,7 +2322,7 @@
                         <list_entry value="yes" short_description="Yes"/><list_entry value="designated" short_description="Designated"/><list_entry value="no" short_description="No"/>
                     </multiselect>
                     <multiselect key="embedded_rails:lanes:backwards" text="Lanes with rails" delimiter="|" match="key" editable="true">
-                        <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narroe guage"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
+                        <list_entry value="abandoned" display_value="Abandoned"/><list_entry value="construction" display_value="Construction"/><list_entry value="disused" display_value="Disused"/><list_entry value="funicular" display_value="Funicular"/><list_entry value="light_rail" display_value="Light rail"/><list_entry value="miniature" display_value="Miniature"/><list_entry value="narrow_gauge" display_value="Narrow gauge"/><list_entry value="rail" display_value="Rail"/><list_entry value="tram" display_value="Tram"/><list_entry value="yes" display_value="Yes"/>
                     </multiselect>
                 </optional>
             </item> <!-- Bi-directional roads -->
@@ -2808,6 +2809,11 @@
             <reference ref="check_crossing_access"/>
             <reference ref="tactile_paving"/>
             <reference ref="kerb"/>
+            <optional>
+                <text key="kerb:height" text="Kerb height (both sides)" value_type="dimension_vertical"/>
+                <text key="kerb:right:height" text="Kerb height (right)" value_type="dimension_vertical"/>
+                <text key="kerb:left:height" text="Kerb height (left)" value_type="dimension_vertical"/>
+            </optional>
             <label text="In case of traffic signals:"/>
             <checkgroup text="In case of traffic signals:" columns="2">  
                 <check key="button_operated" text="Button operated" disable_off="true"/>
@@ -5600,8 +5606,8 @@
             <space/>
             <reference ref="internet_smoking"/>
             <optional>
-                <space/>
                 <reference ref="lgbtq"/>
+                <check key="cocktails" text="Cocktails"/>
             </optional>
             <reference ref="link_contact_address_payment"/>
             <reference ref="highchair"/>
@@ -7582,6 +7588,8 @@
                 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" display_values="Seated,Seated urinal,Squat,Urinal"/>
                 <reference ref="oh_wheelchair_level"/>
                 <check key="drinking_water" text="Drinking Water"/>
+                <check key="toilets:handwashing" text="Handwashing facilities"/>
+                <check key="toilets:paper_supplied" text="Wiping paper supplied"/>
             </optional>
         </item> <!-- Toilets/Restrooms -->
         <item name="Shower" icon="icons/png/amenity_shower_12247.png" type="node,closedway" preset_name_label="true">
@@ -7617,6 +7625,11 @@
             <text key="ref" text="Reference number"/>
             <reference ref="collection_times"/>
             <check key="drive_through" text="Drive through" disable_off="true"/>
+            <combo key="post_box:type" text="Type" values_context="post box">
+                <list_entry value="pillar" text="Pillar"/>
+                <list_entry value="lamp" text="Lamp"/>
+                <list_entry value="wall" text="Wall"/>
+            </combo>
         </item> <!-- Post Box -->
         <item name="Parcel Locker" icon="icons/png/amenity_parcel_locker.png" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:amenity=parcel_locker"/>
@@ -8451,6 +8464,7 @@
             <optional>
                 <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" display_values="Novice,Easy,Intermediate,Advanced,Expert,Freeride" values_context="piste:difficulty" values_searchable="true" values_sort="false"/>
                 <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic+skating,scooter,backcountry" display_values="Classic,Mogul,Skating,Classic+skating,Scooter,Backcountry" values_context="piste:grooming"/>
+                <check key="piste:lit" text="Lit"/>
             </optional>
         </item> <!-- Skiing -->
         <item name="Shooting" icon="icons/png/sport_shooting.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -11660,6 +11674,8 @@
         </checkgroup>
         <space/>
         <check key="payment:contactless" text="Contactless payment" match="keyvalue"/>
+        <check key="payment:qr_code" text="QR Code" match="keyvalue"/>
+        <check key="payment:app" text="Dedicated app" match="keyvalue"/>
         <space/>
         <check key="payment:electronic_purses" text="Electronic purses" match="keyvalue"/>
         <checkgroup text="Electronic purses type" columns="4">
diff --git a/taginfo.json b/taginfo.json
index 52161733b2..4df8b35417 100644
--- a/taginfo.json
+++ b/taginfo.json
@@ -86,6 +86,17 @@
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "shoulder","value": "left","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "shoulder","value": "right","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "shoulder","value": "both","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "oneway","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "motorroad","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "bridge","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "tunnel","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "cutting","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "embankment","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lit","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lane_markings","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "winter_road","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "ice_road","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "placement","value": "left_of:1","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "placement","value": "left_of:2","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "placement","value": "left_of:3","object_types": ["way"]},
@@ -158,6 +169,17 @@
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "shoulder","value": "left","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "shoulder","value": "right","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "shoulder","value": "both","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "oneway","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "motorroad","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "bridge","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "tunnel","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "cutting","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "embankment","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lit","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lane_markings","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "winter_road","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "ice_road","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "placement","value": "left_of:1","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "placement","value": "left_of:2","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "placement","value": "left_of:3","object_types": ["way"]},
@@ -231,6 +253,17 @@
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "shoulder","value": "left","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "shoulder","value": "right","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "shoulder","value": "both","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "oneway","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "motorroad","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "bridge","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "tunnel","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "cutting","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "embankment","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lit","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lane_markings","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "winter_road","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "ice_road","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "placement","value": "left_of:1","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "placement","value": "left_of:2","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "placement","value": "left_of:3","object_types": ["way"]},
@@ -304,6 +337,17 @@
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "shoulder","value": "left","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "shoulder","value": "right","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "shoulder","value": "both","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "oneway","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "motorroad","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "bridge","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "tunnel","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "cutting","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "embankment","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lit","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lane_markings","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "winter_road","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "ice_road","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "placement","value": "left_of:1","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "placement","value": "left_of:2","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "placement","value": "left_of:3","object_types": ["way"]},
@@ -1236,8 +1280,8 @@
 {"description":"Highways/Streets/Residential","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "shoulder","value": "left","object_types": ["way","area"]},
 {"description":"Highways/Streets/Residential","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "shoulder","value": "right","object_types": ["way","area"]},
 {"description":"Highways/Streets/Residential","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "shoulder","value": "both","object_types": ["way","area"]},
-{"description":"Highways/Streets/Bicycle Road","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "bicycle","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Streets/Bicycle Road","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "bicycle_road","value": "yes","object_types": ["way","area"]},
+{"description":"Highways/Streets/Bicycle Road","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "bicycle","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Streets/Bicycle Road","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "highway","object_types": ["way","area"]},
 {"description":"Highways/Streets/Bicycle Road","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "name","object_types": ["way","area"]},
 {"description":"Highways/Streets/Bicycle Road","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_residential_sp.png","key": "motor_vehicle","value": "yes","object_types": ["way","area"]},
@@ -1440,8 +1484,8 @@
 {"description":"Highways/Streets/Service","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "bus_bay","value": "right","object_types": ["way","area"]},
 {"description":"Highways/Streets/Service","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "covered","object_types": ["way","area"]},
 {"description":"Highways/Streets/Service","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "passing_places","object_types": ["way","area"]},
-{"description":"Highways/Streets/Parking Aisle","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "service","value": "parking_aisle","object_types": ["way","area"]},
 {"description":"Highways/Streets/Parking Aisle","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "highway","value": "service","object_types": ["way","area"]},
+{"description":"Highways/Streets/Parking Aisle","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "service","value": "parking_aisle","object_types": ["way","area"]},
 {"description":"Highways/Streets/Parking Aisle","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "surface","object_types": ["way","area"]},
 {"description":"Highways/Streets/Parking Aisle","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "smoothness","value": "excellent","object_types": ["way","area"]},
 {"description":"Highways/Streets/Parking Aisle","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_service_sp.png","key": "smoothness","value": "good","object_types": ["way","area"]},
@@ -2075,6 +2119,10 @@
 {"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "wheelchair:description","object_types": ["way","area"]},
 {"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "wheelchair:entrance_width","object_types": ["way","area"]},
 {"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "wheelchair:step_height","object_types": ["way","area"]},
+{"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "handrail","object_types": ["way","area"]},
+{"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "handrail:left","object_types": ["way","area"]},
+{"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "handrail:center","object_types": ["way","area"]},
+{"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "handrail:right","object_types": ["way","area"]},
 {"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "horse","value": "yes","object_types": ["way","area"]},
 {"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "horse","value": "official","object_types": ["way","area"]},
 {"description":"Highways/Ways/Path","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_way_thin_sp.png","key": "horse","value": "designated","object_types": ["way","area"]},
@@ -2262,8 +2310,8 @@
 {"description":"Highways/Ways/Dedicated Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/cycleway.png","key": "snowmobile","value": "private","object_types": ["way","area"]},
 {"description":"Highways/Ways/Dedicated Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/cycleway.png","key": "snowmobile","value": "permit","object_types": ["way","area"]},
 {"description":"Highways/Ways/Dedicated Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/cycleway.png","key": "snowmobile","value": "no","object_types": ["way","area"]},
-{"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "bicycle","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "highway","value": "path","object_types": ["way","area"]},
+{"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "bicycle","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "foot","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "segregated","value": "yes","object_types": ["way","area"]},
 {"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "name","object_types": ["way","area"]},
@@ -2339,8 +2387,8 @@
 {"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "snowmobile","value": "private","object_types": ["way","area"]},
 {"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "snowmobile","value": "permit","object_types": ["way","area"]},
 {"description":"Highways/Ways/Segregated Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/segregated_foot_and_cycleway.png","key": "snowmobile","value": "no","object_types": ["way","area"]},
-{"description":"Highways/Ways/Combined Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/foot_and_cycleway.png","key": "bicycle","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Ways/Combined Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/foot_and_cycleway.png","key": "highway","value": "path","object_types": ["way","area"]},
+{"description":"Highways/Ways/Combined Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/foot_and_cycleway.png","key": "bicycle","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Ways/Combined Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/foot_and_cycleway.png","key": "foot","value": "designated","object_types": ["way","area"]},
 {"description":"Highways/Ways/Combined Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/foot_and_cycleway.png","key": "segregated","value": "no","object_types": ["way","area"]},
 {"description":"Highways/Ways/Combined Foot- and Cycleway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/foot_and_cycleway.png","key": "name","object_types": ["way","area"]},
@@ -2457,6 +2505,10 @@
 {"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "bicycle","value": "no","object_types": ["way","area"]},
 {"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "segregated","value": "yes","object_types": ["way","area"]},
 {"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "segregated","value": "no","object_types": ["way","area"]},
+{"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "handrail","object_types": ["way","area"]},
+{"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "handrail:left","object_types": ["way","area"]},
+{"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "handrail:center","object_types": ["way","area"]},
+{"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "handrail:right","object_types": ["way","area"]},
 {"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "horse","value": "yes","object_types": ["way","area"]},
 {"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "horse","value": "official","object_types": ["way","area"]},
 {"description":"Highways/Ways/Dedicated Footway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/footway.png","key": "horse","value": "designated","object_types": ["way","area"]},
@@ -2499,6 +2551,9 @@
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "layer","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "surface","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "step_count","object_types": ["way"]},
+{"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp","object_types": ["way"]},
+{"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:stroller","object_types": ["way"]},
+{"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:bicycle","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:wheelchair","value": "yes","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:wheelchair","value": "limited","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:wheelchair","value": "no","object_types": ["way"]},
@@ -2506,6 +2561,10 @@
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:luggage","value": "automatic","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:luggage","value": "manual","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "ramp:luggage","value": "no","object_types": ["way"]},
+{"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "handrail","object_types": ["way"]},
+{"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "handrail:left","object_types": ["way"]},
+{"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "handrail:center","object_types": ["way"]},
+{"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "handrail:right","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "conveying","value": "yes","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "conveying","value": "forward","object_types": ["way"]},
 {"description":"Highways/Ways/Steps","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_steps.png","key": "conveying","value": "backward","object_types": ["way"]},
@@ -2567,6 +2626,11 @@
 {"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "changing_table:location","value": "room","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "changing_table:location","value": "sales_area","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "toilets:wheelchair","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Services","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_services_18024.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "highway","value": "rest_area","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "name","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "toilets","object_types": ["node","area"]},
@@ -2601,6 +2665,11 @@
 {"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "picnic_table","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "caravan","value": "yes","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "caravan","value": "no","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Highways/Waypoints/Rest Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rest_area_18021.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "highway","value": "traffic_signals","object_types": ["node"]},
 {"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "traffic_signals","value": "blinker","object_types": ["node"]},
 {"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "traffic_signals","value": "blink_mode","object_types": ["node"]},
@@ -2646,6 +2715,10 @@
 {"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "crossing:markings","value": "ladder:skewed","object_types": ["node"]},
 {"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "crossing:markings","value": "ladder:paired","object_types": ["node"]},
 {"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "crossing:markings","value": "pictograms","object_types": ["node"]},
+{"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "horse","object_types": ["node"]},
+{"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "button_operated","object_types": ["node"]},
+{"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "traffic_signals:sound","object_types": ["node"]},
 {"description":"Highways/Waypoints/Traffic Signal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/traffic_lights.png","key": "name","object_types": ["node"]},
 {"description":"Highways/Waypoints/Stop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_stop_18064.png","key": "highway","value": "stop","object_types": ["node"]},
 {"description":"Highways/Waypoints/Stop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_stop_18064.png","key": "stop","value": "all","object_types": ["node"]},
@@ -2703,6 +2776,8 @@
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "crossing:markings","value": "ladder:paired","object_types": ["node"]},
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "crossing:markings","value": "pictograms","object_types": ["node"]},
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "supervised","object_types": ["node"]},
+{"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "horse","object_types": ["node"]},
+{"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "bicycle","object_types": ["node"]},
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "tactile_paving","value": "yes","object_types": ["node"]},
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "tactile_paving","value": "no","object_types": ["node"]},
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "tactile_paving","value": "incorrect","object_types": ["node"]},
@@ -2724,6 +2799,11 @@
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "kerb:right","value": "flush","object_types": ["node"]},
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "kerb:right","value": "rolled","object_types": ["node"]},
 {"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "kerb:right","value": "no","object_types": ["node"]},
+{"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "kerb:height","object_types": ["node"]},
+{"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "kerb:right:height","object_types": ["node"]},
+{"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "kerb:left:height","object_types": ["node"]},
+{"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "button_operated","object_types": ["node"]},
+{"description":"Highways/Waypoints/Pedestrian Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_crossing_18002.png","key": "traffic_signals:sound","object_types": ["node"]},
 {"description":"Highways/Waypoints/Traffic Calming/Traffic Calming","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_speedbump.png","key": "traffic_calming","object_types": ["node","way"]},
 {"description":"Highways/Waypoints/Traffic Calming/Traffic Calming","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_speedbump.png","key": "traffic_calming","value": "bump","object_types": ["node","way"]},
 {"description":"Highways/Waypoints/Traffic Calming/Traffic Calming","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_speedbump.png","key": "traffic_calming","value": "hump","object_types": ["node","way"]},
@@ -2901,6 +2981,9 @@
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "vehicle","value": "no","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "vehicle","value": "agricultural","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "vehicle","value": "forestry","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "foot","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "bicycle","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "horse","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "wheelchair","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "wheelchair:description","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "wheelchair:entrance_width","object_types": ["node","way","area"]},
@@ -2917,6 +3000,10 @@
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "motor_vehicle","value": "no","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "motor_vehicle","value": "agricultural","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "motor_vehicle","value": "forestry","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "motorcar","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "motorcycle","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "moped","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Block","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_blocks.png","key": "mofa","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "barrier","value": "bollard","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "bollard","value": "rising","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "bollard","value": "removable","object_types": ["node","way"]},
@@ -2941,6 +3028,9 @@
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "vehicle","value": "no","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "vehicle","value": "agricultural","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "vehicle","value": "forestry","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "foot","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "bicycle","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "horse","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "wheelchair","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "wheelchair:description","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "wheelchair:entrance_width","object_types": ["node","way"]},
@@ -2957,10 +3047,16 @@
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "motor_vehicle","value": "no","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "motor_vehicle","value": "agricultural","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "motor_vehicle","value": "forestry","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "motorcar","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "motorcycle","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "moped","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Bollard","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bollard.png","key": "mofa","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "barrier","value": "cycle_barrier","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "bicycle","value": "yes","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "bicycle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "bicycle","value": "dismount","object_types": ["node"]},
+{"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "motor_vehicle","value": "yes","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "motor_vehicle","value": "official","object_types": ["node"]},
@@ -2974,6 +3070,10 @@
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "cycle_barrier","value": "single","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "cycle_barrier","value": "double","object_types": ["node"]},
 {"description":"Highways/Barriers/Cycle Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cycle_barrier.png","key": "cycle_barrier","value": "triple","object_types": ["node"]},
@@ -3007,6 +3107,9 @@
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3023,6 +3126,10 @@
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Cattle Grid","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_cattle_grid.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "barrier","value": "bus_trap","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "maxwidth","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "vehicle","value": "yes","object_types": ["node"]},
@@ -3037,6 +3144,9 @@
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3053,6 +3163,10 @@
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Bus Trap","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bus_trap_13006.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "barrier","value": "spikes","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "maxwidth","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "vehicle","value": "yes","object_types": ["node"]},
@@ -3067,6 +3181,9 @@
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3083,6 +3200,10 @@
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Spikes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_spikes_13032.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "barrier","value": "height_restrictor","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "maxheight","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "maxwidth","object_types": ["node"]},
@@ -3098,6 +3219,9 @@
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3114,6 +3238,10 @@
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Height restrictor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_height_restrictor.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "barrier","value": "toll_booth","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "name","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "ref","object_types": ["node","area"]},
@@ -3125,6 +3253,13 @@
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "lanes:backward","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "maxheight","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "maxwidth","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "payment:coins","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "payment:notes","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "payment:e_zpass","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "payment:license_plate","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "foot","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "bicycle","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "horse","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "wheelchair","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
@@ -3141,6 +3276,10 @@
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "motor_vehicle","value": "no","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "motor_vehicle","value": "agricultural","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "motor_vehicle","value": "forestry","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "motorcar","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "motorcycle","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "moped","object_types": ["node","area"]},
+{"description":"Highways/Barriers/Toll Booth","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_toll_booth.png","key": "mofa","object_types": ["node","area"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "barrier","value": "border_control","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "name","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "ref","object_types": ["node"]},
@@ -3164,6 +3303,9 @@
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3180,6 +3322,10 @@
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Border Control","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_border_control_13003.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Hedge","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hedge.png","key": "barrier","value": "hedge","object_types": ["way","area"]},
 {"description":"Highways/Barriers/Hedge","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hedge.png","key": "leaf_type","value": "broadleaved","object_types": ["way","area"]},
 {"description":"Highways/Barriers/Hedge","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hedge.png","key": "leaf_type","value": "needleleaved","object_types": ["way","area"]},
@@ -3271,6 +3417,9 @@
 {"description":"Highways/Barriers/Jersey Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_jersey_barrier_13016.png","key": "material","value": "concrete","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Jersey Barrier","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_jersey_barrier_13016.png","key": "material","value": "plastic","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "barrier","value": "log","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "foot","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "bicycle","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "horse","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "wheelchair","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "wheelchair:description","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "wheelchair:entrance_width","object_types": ["node","way"]},
@@ -3287,6 +3436,10 @@
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "motor_vehicle","value": "no","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "motor_vehicle","value": "agricultural","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "motor_vehicle","value": "forestry","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "motorcar","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "motorcycle","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "moped","object_types": ["node","way"]},
+{"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "mofa","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "vehicle","value": "yes","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "vehicle","value": "official","object_types": ["node","way"]},
 {"description":"Highways/Barriers/Log","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "vehicle","value": "designated","object_types": ["node","way"]},
@@ -3343,6 +3496,9 @@
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3359,6 +3515,10 @@
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Entrance (Barrier Opening)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_entrance.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "barrier","value": "gate","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "ref","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "maxheight","object_types": ["node"]},
@@ -3375,6 +3535,9 @@
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3391,6 +3554,10 @@
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_gate.png","key": "locked","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "barrier","value": "lift_gate","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "lift_gate:type","value": "single","object_types": ["node"]},
@@ -3409,6 +3576,9 @@
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3425,6 +3595,10 @@
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Lift Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_lift_gate.png","key": "locked","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "barrier","value": "swing_gate","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "swing_gate:type","value": "single","object_types": ["node"]},
@@ -3443,6 +3617,9 @@
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3459,6 +3636,10 @@
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Swing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_swing_gate_13034.png","key": "locked","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "barrier","value": "hampshire_gate","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "maxlength","object_types": ["node"]},
@@ -3475,6 +3656,9 @@
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3491,6 +3675,10 @@
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Hampshire Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_hampshire_gate_13014.png","key": "locked","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "barrier","value": "bump_gate","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "maxlength","object_types": ["node"]},
@@ -3507,6 +3695,9 @@
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3523,9 +3714,16 @@
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Barriers/Bump Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_bump_gate_13005.png","key": "locked","object_types": ["node"]},
 {"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "barrier","value": "kissing_gate","object_types": ["node"]},
 {"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "maxwidth","object_types": ["node"]},
+{"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Kissing Gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_kissing_gate.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3547,6 +3745,9 @@
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "vehicle","value": "no","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "vehicle","value": "agricultural","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "vehicle","value": "forestry","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "foot","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "bicycle","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "horse","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "wheelchair","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "wheelchair:description","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "wheelchair:entrance_width","object_types": ["node","way","area"]},
@@ -3563,6 +3764,10 @@
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "motor_vehicle","value": "no","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "motor_vehicle","value": "agricultural","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "motor_vehicle","value": "forestry","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "motorcar","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "motorcycle","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "moped","object_types": ["node","way","area"]},
+{"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "mofa","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Chain","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_chain_13008.png","key": "locked","object_types": ["node","way","area"]},
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "barrier","value": "stile","object_types": ["node"]},
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "stile","value": "ladder","object_types": ["node"]},
@@ -3584,6 +3789,9 @@
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Stile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_stile.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3603,6 +3811,9 @@
 {"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_turnstile_13037.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3623,12 +3834,18 @@
 {"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "wheelchair:entrance_width","object_types": ["node"]},
 {"description":"Highways/Barriers/Full-Height Turnstile","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_full-height_turnstile_13038.png","key": "wheelchair:step_height","object_types": ["node"]},
 {"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "barrier","value": "wicket_gate","object_types": ["node"]},
 {"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "maxwidth","object_types": ["node"]},
+{"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Wicket gate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier_empty.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3648,6 +3865,9 @@
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "foot","object_types": ["node"]},
+{"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "bicycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "horse","object_types": ["node"]},
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "wheelchair","object_types": ["node"]},
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "wheelchair:description","object_types": ["node"]},
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "wheelchair:entrance_width","object_types": ["node"]},
@@ -3664,6 +3884,10 @@
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "motor_vehicle","value": "no","object_types": ["node"]},
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "motor_vehicle","value": "agricultural","object_types": ["node"]},
 {"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "motor_vehicle","value": "forestry","object_types": ["node"]},
+{"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "motorcar","object_types": ["node"]},
+{"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "moped","object_types": ["node"]},
+{"description":"Highways/Barriers/Sally Port","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_sally_port_13031.png","key": "mofa","object_types": ["node"]},
 {"description":"Highways/Passageways/Tunnel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_tunnel_sp.png","key": "tunnel","value": "yes","object_types": ["way"]},
 {"description":"Highways/Passageways/Tunnel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_tunnel_sp.png","key": "name","object_types": ["way"]},
 {"description":"Highways/Passageways/Tunnel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_tunnel_sp.png","key": "tunnel:name","object_types": ["way"]},
@@ -4335,8 +4559,8 @@
 {"description":"Water/Water/Culvert","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_tunnel_sp.png","key": "name","object_types": ["way"]},
 {"description":"Water/Water/Culvert","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_tunnel_sp.png","key": "layer","object_types": ["way"]},
 {"description":"Water/Water/Culvert","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_tunnel_sp.png","key": "width","object_types": ["way"]},
-{"description":"Water/Water/Penstock","key": "man_made","value": "pipeline","object_types": ["way"]},
 {"description":"Water/Water/Penstock","key": "waterway","value": "pressurised","object_types": ["way"]},
+{"description":"Water/Water/Penstock","key": "man_made","value": "pipeline","object_types": ["way"]},
 {"description":"Water/Water/Penstock","key": "substance","value": "water","object_types": ["way"]},
 {"description":"Water/Water/Penstock","key": "usage","value": "penstock","object_types": ["way"]},
 {"description":"Water/Water/Penstock","key": "location","value": "overground","object_types": ["way"]},
@@ -4763,6 +4987,22 @@
 {"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "name","object_types": ["node","area"]},
 {"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.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": "opening_hours","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:diesel","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:biodiesel","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_80","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_87","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_89","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_91","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_92","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_93","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_95","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_98","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_100","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:e10","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:e85","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:ethanol","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:lpg","object_types": ["node","area"]},
+{"description":"Water/Shipping/Marine Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:cng","object_types": ["node","area"]},
 {"description":"Water/Shipping/Water point","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_water_point_34025.png","key": "waterway","value": "water_point","object_types": ["node"]},
 {"description":"Water/Shipping/Water point","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_water_point_34025.png","key": "drinking_water","object_types": ["node"]},
 {"description":"Water/Shipping/Water point","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/water_water_point_34025.png","key": "access","object_types": ["node"]},
@@ -5311,6 +5551,8 @@
 {"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "crossing","value": "uncontrolled","object_types": ["node"]},
 {"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "crossing","value": "traffic_signals","object_types": ["node"]},
 {"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "supervised","object_types": ["node"]},
+{"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "horse","object_types": ["node"]},
+{"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "bicycle","object_types": ["node"]},
 {"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "crossing:light","object_types": ["node"]},
 {"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "crossing:bell","object_types": ["node"]},
 {"description":"Transport/Railway/Crossing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/level_crossing.png","key": "crossing:barrier","value": "yes","object_types": ["node"]},
@@ -5611,7 +5853,29 @@
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:diesel","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:biodiesel","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:GTL_diesel","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:HGV_diesel","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_80","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_87","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_91","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_92","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_95","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_98","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:octane_100","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:e10","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:e85","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:ethanol","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:lpg","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:cng","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:biogas","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:1_25","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:1_50","object_types": ["node","area"]},
 {"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "fuel:adblue","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "payment:dkv","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "payment:routex","object_types": ["node","area"]},
+{"description":"Transport/Car/Fuel","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_fuel.png","key": "payment:uta","object_types": ["node","area"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "amenity","value": "charging_station","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "brand","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "brand:wikipedia","object_types": ["node"]},
@@ -5623,6 +5887,17 @@
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "fee","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "indoor","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "level","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "bicycle","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "scooter","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "motorcar","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "truck","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:none","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:app","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:phone_call","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:short_message","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:nfc","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:membership_card","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "voltage","value": "230","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "voltage","value": "400","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "amperage","value": "16","object_types": ["node"]},
@@ -5708,6 +5983,17 @@
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "fee","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "indoor","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "level","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "bicycle","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "scooter","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "motorcar","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "motorcycle","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "truck","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:none","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:app","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:phone_call","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:short_message","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:nfc","object_types": ["node"]},
+{"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "authentication:membership_card","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "voltage","value": "230","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "voltage","value": "400","object_types": ["node"]},
 {"description":"Transport/Car/Charging Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_charging_station.png","key": "amperage","value": "16","object_types": ["node"]},
@@ -5768,6 +6054,8 @@
 {"description":"Transport/Car/Car Wash","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_car_wash_12018.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Transport/Car/Car Wash","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_car_wash_12018.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Transport/Car/Car Wash","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_car_wash_12018.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Transport/Car/Car Wash","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_car_wash_12018.png","key": "automated","object_types": ["node","area"]},
+{"description":"Transport/Car/Car Wash","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_car_wash_12018.png","key": "self_service","object_types": ["node","area"]},
 {"description":"Transport/Car/Car Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_car.png","key": "shop","value": "car","object_types": ["node","area"]},
 {"description":"Transport/Car/Car Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_car.png","key": "name","object_types": ["node","area"]},
 {"description":"Transport/Car/Car Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_car.png","key": "operator","object_types": ["node","area"]},
@@ -6141,6 +6429,13 @@
 {"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "service:bicycle:retail","object_types": ["node","area"]},
+{"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "service:bicycle:second_hand","object_types": ["node","area"]},
+{"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "service:bicycle:repair","object_types": ["node","area"]},
+{"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "service:bicycle:rental","object_types": ["node","area"]},
+{"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "service:bicycle:pump","object_types": ["node","area"]},
+{"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "service:bicycle:diy","object_types": ["node","area"]},
+{"description":"Transport/Bicycle/Bike Dealer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bicycle.png","key": "service:bicycle:cleaning","object_types": ["node","area"]},
 {"description":"Transport/Bicycle/Rental","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rental_bicycle.png","key": "amenity","value": "bicycle_rental","object_types": ["node","area"]},
 {"description":"Transport/Bicycle/Rental","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rental_bicycle.png","key": "bicycle_rental","value": "docking_station","object_types": ["node","area"]},
 {"description":"Transport/Bicycle/Rental","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_rental_bicycle.png","key": "bicycle_rental","value": "dropoff_point","object_types": ["node","area"]},
@@ -6166,7 +6461,6 @@
 {"description":"Transport/Bicycle/Public Bicycle Repair Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_bicycle_repair_station.png","key": "service:bicycle:pump","object_types": ["node","area"]},
 {"description":"Transport/Bicycle/Public Bicycle Repair Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_bicycle_repair_station.png","key": "service:bicycle:tools","object_types": ["node","area"]},
 {"description":"Transport/Bicycle/Public Bicycle Repair Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_bicycle_repair_station.png","key": "service:bicycle:chain_tool","object_types": ["node","area"]},
-{"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "public_transport:version","value": "2","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "train","object_types": ["relation"]},
@@ -6174,6 +6468,7 @@
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "monorail","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "tram","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "light_rail","object_types": ["relation"]},
+{"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "public_transport:version","value": "2","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "from","object_types": ["relation"]},
@@ -6208,12 +6503,12 @@
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "reservation","value": "recommended","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Rail)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "website","object_types": ["relation"]},
-{"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "public_transport:version","value": "2","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "bus","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "share_taxi","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "trolleybus","object_types": ["relation"]},
+{"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "public_transport:version","value": "2","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "from","object_types": ["relation"]},
@@ -6248,9 +6543,9 @@
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "reservation","value": "recommended","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Bus)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "website","object_types": ["relation"]},
+{"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "route","value": "ferry","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "public_transport:version","value": "2","object_types": ["relation"]},
-{"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "ferry:cable","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "opening_hours","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "from","object_types": ["relation"]},
@@ -6285,9 +6580,9 @@
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "reservation","value": "recommended","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "website","object_types": ["relation"]},
+{"description":"Transport/Public Transport/Public Transport Route (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "aerialway","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "public_transport:version","value": "2","object_types": ["relation"]},
-{"description":"Transport/Public Transport/Public Transport Route (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Public Transport Route (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "from","object_types": ["relation"]},
@@ -6338,8 +6633,8 @@
 {"description":"Transport/Public Transport/Route Master","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Route Master","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "colour","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Route Master","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "website","object_types": ["relation"]},
-{"description":"Transport/Public Transport/Stop Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/interpolation.png","key": "public_transport","value": "stop_area","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Stop Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/interpolation.png","key": "type","value": "public_transport","object_types": ["relation"]},
+{"description":"Transport/Public Transport/Stop Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/interpolation.png","key": "public_transport","value": "stop_area","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Stop Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/interpolation.png","key": "name","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Stop Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/interpolation.png","key": "ref","object_types": ["relation"]},
 {"description":"Transport/Public Transport/Stop Area","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/interpolation.png","key": "uic_ref","object_types": ["relation"]},
@@ -6356,6 +6651,18 @@
 {"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "tactile_paving","value": "yes","object_types": ["node"]},
 {"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "tactile_paving","value": "no","object_types": ["node"]},
 {"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "tactile_paving","value": "incorrect","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "railway","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "bus","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "tram","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "train","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "trolleybus","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "share_taxi","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "subway","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "light_rail","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "monorail","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "funicular","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "aerialway","object_types": ["node"]},
+{"description":"Transport/Public Transport/Stop Position","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/barrier.png","key": "ferry","object_types": ["node"]},
 {"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "public_transport","value": "platform","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "bench","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "shelter","object_types": ["node","way","area"]},
@@ -6377,12 +6684,25 @@
 {"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "uic_name","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "operator","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "network","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "bus","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "tram","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "train","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "trolleybus","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "share_taxi","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "subway","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "monorail","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "funicular","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "aerialway","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "ferry","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "highway","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport/Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_32003.png","key": "railway","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport/Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_train_station2.png","key": "public_transport","value": "station","object_types": ["node","area"]},
 {"description":"Transport/Public Transport/Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_train_station2.png","key": "name","object_types": ["node","area"]},
 {"description":"Transport/Public Transport/Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_train_station2.png","key": "area","object_types": ["node","area"]},
 {"description":"Transport/Public Transport/Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_train_station2.png","key": "building","object_types": ["node","area"]},
 {"description":"Transport/Public Transport/Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_train_station2.png","key": "operator","object_types": ["node","area"]},
 {"description":"Transport/Public Transport/Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_train_station2.png","key": "network","object_types": ["node","area"]},
+{"description":"Transport/Public Transport/Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_train_station2.png","key": "railway","object_types": ["node","area"]},
 {"description":"Transport/Public Transport/Subway Entrance","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_subway.png","key": "railway","value": "subway_entrance","object_types": ["node"]},
 {"description":"Transport/Public Transport/Subway Entrance","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_subway.png","key": "name","object_types": ["node"]},
 {"description":"Transport/Public Transport/Subway Entrance","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_subway.png","key": "ref","object_types": ["node"]},
@@ -6438,9 +6758,9 @@
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "reservation","value": "recommended","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "website","object_types": ["relation"]},
+{"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "route","value": "ferry","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "public_transport:version","value": "1","object_types": ["relation"]},
-{"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "operator","object_types": ["relation"]},
@@ -6483,9 +6803,9 @@
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "reservation","value": "recommended","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Ferry)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_ferry_route_sp.png","key": "website","object_types": ["relation"]},
+{"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "route","value": "aerialway","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "public_transport:version","value": "1","object_types": ["relation"]},
-{"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Transport/Public Transport (Legacy)/Public transport route (Legacy) (Aerialway)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_route_sp.png","key": "operator","object_types": ["relation"]},
@@ -6550,6 +6870,16 @@
 {"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "uic_name","object_types": ["way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "operator","object_types": ["way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "network","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "bus","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "tram","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "train","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "trolleybus","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "share_taxi","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "subway","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "monorail","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "funicular","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "aerialway","object_types": ["way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "ferry","object_types": ["way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "width","object_types": ["way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Railway Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_train.png","key": "area","object_types": ["way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Bus Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_bus_station.png","key": "amenity","value": "bus_station","object_types": ["node","area"]},
@@ -6582,6 +6912,16 @@
 {"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "uic_name","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "operator","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "network","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "bus","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "tram","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "train","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "trolleybus","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "share_taxi","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "subway","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "monorail","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "funicular","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "aerialway","object_types": ["node","way","area"]},
+{"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "ferry","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "width","object_types": ["node","way","area"]},
 {"description":"Transport/Public Transport (Legacy)/Bus Platform","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_platform_bus.png","key": "area","object_types": ["node","way","area"]},
 {"description":"Transport/Taxi","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/transport_taxi_rank.png","key": "amenity","value": "taxi","object_types": ["node","area"]},
@@ -7092,6 +7432,10 @@
 {"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "reservation","value": "recommended","object_types": ["node","area"]},
 {"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "reservation","value": "members_only","object_types": ["node","area"]},
 {"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "capacity","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "tents","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "caravans","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "backcountry","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "group_only","object_types": ["node","area"]},
 {"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "sanitary_dump_station","object_types": ["node","area"]},
 {"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "internet_access","value": "yes","object_types": ["node","area"]},
 {"description":"Facilities/Accommodation/Campsite","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camping.png","key": "internet_access","value": "wlan","object_types": ["node","area"]},
@@ -7111,6 +7455,11 @@
 {"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "addr:unit","object_types": ["node","area"]},
 {"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "capacity","object_types": ["node","area"]},
 {"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "surface","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "tents","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "caravans","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "drinking_water","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "power_supply","object_types": ["node","area"]},
+{"description":"Facilities/Accommodation/Camp pitch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/accommodation_camp_pitch.png","key": "permanent_camping","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "amenity","value": "restaurant","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "operator","object_types": ["node","area"]},
@@ -7272,6 +7621,11 @@
 {"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "smoking","value": "outside","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "smoking","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Restaurant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_restaurant.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "amenity","value": "fast_food","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "operator","object_types": ["node","area"]},
@@ -7421,6 +7775,11 @@
 {"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "smoking","value": "outside","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "smoking","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Fast Food","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood2.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "amenity","value": "food_court","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "operator","object_types": ["node","area"]},
@@ -7472,6 +7831,11 @@
 {"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "smoking","value": "outside","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "smoking","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Food Court","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_fastfood.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "amenity","value": "cafe","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "operator","object_types": ["node","area"]},
@@ -7537,6 +7901,11 @@
 {"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "smoking","value": "outside","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "smoking","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_cafe.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "amenity","value": "cafe","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "cuisine","value": "bubble_tea","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "name","object_types": ["node","area"]},
@@ -7588,6 +7957,11 @@
 {"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "smoking","value": "outside","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "smoking","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bubble Tea Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bubble_tea.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "amenity","value": "ice_cream","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "operator","object_types": ["node","area"]},
@@ -7651,6 +8025,11 @@
 {"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "smoking","value": "outside","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "smoking","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Ice cream","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_ice_cream_12077.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "amenity","value": "pub","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "operator","object_types": ["node","area"]},
@@ -7720,6 +8099,11 @@
 {"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "lgbtq:men","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "lgbtq:trans","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Pub","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_pub.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "amenity","value": "biergarten","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "operator","object_types": ["node","area"]},
@@ -7770,6 +8154,11 @@
 {"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "smoking","value": "outside","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "smoking","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Beer Garden","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_biergarten.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "amenity","value": "bar","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "operator","object_types": ["node","area"]},
@@ -7824,7 +8213,13 @@
 {"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "lgbtq:women","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "lgbtq:men","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "lgbtq:trans","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "cocktails","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "highchair","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Food+Drinks/Bar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/food_bar.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Diet","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "diet:vegetarian","value": "yes","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Diet","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "diet:vegetarian","value": "no","object_types": ["node","area"]},
 {"description":"Facilities/Food+Drinks/Diet","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "diet:vegetarian","value": "only","object_types": ["node","area"]},
@@ -8045,6 +8440,11 @@
 {"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "ref","object_types": ["node"]},
 {"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "operator","object_types": ["node"]},
 {"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "ele","object_types": ["node"]},
+{"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "hiking","object_types": ["node"]},
+{"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "bicycle","object_types": ["node"]},
+{"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "mtb","object_types": ["node"]},
+{"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "ski","object_types": ["node"]},
+{"description":"Facilities/Tourism/Route marker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_marker.png","key": "horse","object_types": ["node"]},
 {"description":"Facilities/Leisure/Movie Theater/Cinema","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_cinema2.png","key": "amenity","value": "cinema","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Movie Theater/Cinema","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_cinema2.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Movie Theater/Cinema","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_cinema2.png","key": "operator","object_types": ["node","area"]},
@@ -8315,6 +8715,11 @@
 {"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Amusement/Theme Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_theme_park.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Water Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_swimming_indoor.png","key": "leisure","value": "water_park","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Water Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_swimming_indoor.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Water Park","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_swimming_indoor.png","key": "operator","object_types": ["node","area"]},
@@ -8466,6 +8871,9 @@
 {"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "bath:type","value": "thermal","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "bath:open_air","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "shower","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "female","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "male","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "unisex","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "operator","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Public bath","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_public_bath_29162.png","key": "opening_hours","object_types": ["node","area"]},
@@ -8612,6 +9020,11 @@
 {"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "changing_table:location","value": "sales_area","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "toilets:wheelchair","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "toilets:access","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Toy library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toys.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "leisure","value": "playground","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "access","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "min_age","object_types": ["node","area"]},
@@ -8625,6 +9038,41 @@
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:activitypanel","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:aerialrotator","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:balancebeam","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:basketball_backboard","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:basketrotator","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:basketswing","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:chain_ladder","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:chess_table","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:climbingframe","object_types": ["node","area"]},
+{"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: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: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"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:sandpit","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:seesaw","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:skate_equipment","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:sledding","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:slide","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:spinner","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:splash_pad","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:springy","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:stepping_stones","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:structure","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:swing","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:teenshelter","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:trampoline","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:tree_house","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:tunnel_tube","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:water","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:zigzagtwister","object_types": ["node","area"]},
+{"description":"Facilities/Leisure/Playground","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_playground.png","key": "playground:zipwire","object_types": ["node","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": "activitypanel","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": "aerialrotator","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": "balancebeam","object_types": ["node","way","area"]},
@@ -9009,6 +9457,11 @@
 {"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "image","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "mapillary","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "wikimedia_commons","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Museum","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_museum.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Art gallery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_gallery_30041.png","key": "tourism","value": "gallery","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Art gallery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_gallery_30041.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Art gallery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_gallery_30041.png","key": "operator","object_types": ["node","area"]},
@@ -9257,6 +9710,11 @@
 {"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "changing_table:location","value": "sales_area","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "toilets:wheelchair","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "toilets:access","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Culture/Library","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_library.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Public bookcase","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "amenity","value": "public_bookcase","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Public bookcase","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Culture/Public bookcase","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "operator","object_types": ["node","area"]},
@@ -9693,6 +10151,11 @@
 {"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "changing_table:location","value": "sales_area","object_types": ["node","area"]},
 {"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "toilets:wheelchair","object_types": ["node","area"]},
 {"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "toilets:access","object_types": ["node","area"]},
+{"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Public Building/Community Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_community_centre_12035.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Public Building/Conference Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "amenity","value": "conference_centre","object_types": ["node","area"]},
 {"description":"Facilities/Public Building/Conference Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Public Building/Conference Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "operator","object_types": ["node","area"]},
@@ -10395,6 +10858,11 @@
 {"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "healthcare","value": "hospital","object_types": ["node","area"]},
 {"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "operator","object_types": ["node","area"]},
+{"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Health/Hospital","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "amenity","value": "clinic","object_types": ["node","area"]},
 {"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "healthcare","value": "clinic","object_types": ["node","area"]},
 {"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "healthcare:speciality","value": "general","object_types": ["node","area"]},
@@ -10420,6 +10888,11 @@
 {"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "operator","object_types": ["node","area"]},
 {"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "level","object_types": ["node","area"]},
+{"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Health/Clinic","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_hospital.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "amenity","value": "doctors","object_types": ["node","area"]},
 {"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "healthcare","value": "doctor","object_types": ["node","area"]},
 {"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "healthcare:speciality","value": "general","object_types": ["node","area"]},
@@ -10449,6 +10922,11 @@
 {"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "level","object_types": ["node","area"]},
+{"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Health/Doctor's Office","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_doctors.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "amenity","value": "dentist","object_types": ["node","area"]},
 {"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "healthcare","value": "dentist","object_types": ["node","area"]},
 {"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "healthcare:speciality","value": "dental_oral_maxillo_facial_surgery","object_types": ["node","area"]},
@@ -10465,9 +10943,14 @@
 {"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "level","object_types": ["node","area"]},
+{"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Health/Dentist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Health/Orthodontist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "amenity","value": "dentist","object_types": ["node","area"]},
-{"description":"Facilities/Health/Orthodontist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "healthcare:speciality","value": "orthodontics","object_types": ["node","area"]},
 {"description":"Facilities/Health/Orthodontist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "healthcare","value": "dentist","object_types": ["node","area"]},
+{"description":"Facilities/Health/Orthodontist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "healthcare:speciality","value": "orthodontics","object_types": ["node","area"]},
 {"description":"Facilities/Health/Orthodontist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Health/Orthodontist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "opening_hours","object_types": ["node","area"]},
 {"description":"Facilities/Health/Orthodontist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_dentist.png","key": "wheelchair","object_types": ["node","area"]},
@@ -10486,6 +10969,11 @@
 {"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "level","object_types": ["node","area"]},
 {"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "dispensing","object_types": ["node","area"]},
+{"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Health/Pharmacy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_pharmacy.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Health/Baby Hatch/Safe Haven","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_baby_hatch_12003.png","key": "amenity","value": "baby_hatch","object_types": ["node","area"]},
 {"description":"Facilities/Health/Baby Hatch/Safe Haven","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_baby_hatch_12003.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Health/Baby Hatch/Safe Haven","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_baby_hatch_12003.png","key": "operator","object_types": ["node","area"]},
@@ -10711,15 +11199,15 @@
 {"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "emergency","value": "lifeguard_base","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "ref","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "operator","object_types": ["node"]},
-{"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "lifeguard","value": "base","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "emergency","value": "lifeguard","object_types": ["node"]},
+{"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "lifeguard","value": "base","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "ref","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard base","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_empty.png","key": "operator","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "emergency","value": "lifeguard_tower","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "ref","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "operator","object_types": ["node"]},
-{"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "lifeguard","value": "tower","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "emergency","value": "lifeguard_tower","object_types": ["node"]},
+{"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "lifeguard","value": "tower","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "ref","object_types": ["node"]},
 {"description":"Facilities/Emergency/Lifeguard tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_lifeguard_tower_12076.png","key": "operator","object_types": ["node"]},
 {"description":"Facilities/Emergency/Life ring","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/emergency_life_ring_12080.png","key": "emergency","value": "life_ring","object_types": ["node"]},
@@ -10897,8 +11385,8 @@
 {"description":"Facilities/Social Facilities/Food Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_food_bank_12250.png","key": "toilets:wheelchair","object_types": ["node","area"]},
 {"description":"Facilities/Social Facilities/Food Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_food_bank_12250.png","key": "toilets:access","object_types": ["node","area"]},
 {"description":"Facilities/Social Facilities/Retirement Home","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_retirement_home_12240.png","key": "amenity","value": "social_facility","object_types": ["node","area"]},
-{"description":"Facilities/Social Facilities/Retirement Home","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_retirement_home_12240.png","key": "social_facility:for","value": "senior","object_types": ["node","area"]},
 {"description":"Facilities/Social Facilities/Retirement Home","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_retirement_home_12240.png","key": "social_facility","value": "group_home","object_types": ["node","area"]},
+{"description":"Facilities/Social Facilities/Retirement Home","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_retirement_home_12240.png","key": "social_facility:for","value": "senior","object_types": ["node","area"]},
 {"description":"Facilities/Social Facilities/Retirement Home","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_retirement_home_12240.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Social Facilities/Retirement Home","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_retirement_home_12240.png","key": "operator","object_types": ["node","area"]},
 {"description":"Facilities/Social Facilities/Retirement Home","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_retirement_home_12240.png","key": "wheelchair","object_types": ["node","area"]},
@@ -11562,6 +12050,9 @@
 {"description":"Facilities/Animal/Animal watering place","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "description","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "amenity","value": "toilets","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "access","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "female","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "male","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "unisex","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:disposal","value": "flush","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:disposal","value": "pitlatrine","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:disposal","value": "chemical","object_types": ["node","area"]},
@@ -11604,8 +12095,13 @@
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "level","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Toilets/Restrooms","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_toilets.png","key": "drinking_water","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:handwashing","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:paper_supplied","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "amenity","value": "shower","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "access","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "female","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "male","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "unisex","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "description","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "fee","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Shower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_shower_12247.png","key": "operator","object_types": ["node","area"]},
@@ -11623,6 +12119,9 @@
 {"description":"Facilities/Facilities/Post Box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_box.png","key": "ref","object_types": ["node"]},
 {"description":"Facilities/Facilities/Post Box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_box.png","key": "collection_times","object_types": ["node"]},
 {"description":"Facilities/Facilities/Post Box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_box.png","key": "drive_through","object_types": ["node"]},
+{"description":"Facilities/Facilities/Post Box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_box.png","key": "post_box:type","value": "pillar","object_types": ["node"]},
+{"description":"Facilities/Facilities/Post Box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_box.png","key": "post_box:type","value": "lamp","object_types": ["node"]},
+{"description":"Facilities/Facilities/Post Box","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_post_box.png","key": "post_box:type","value": "wall","object_types": ["node"]},
 {"description":"Facilities/Facilities/Parcel Locker","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_parcel_locker.png","key": "amenity","value": "parcel_locker","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": "brand","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": "operator","object_types": ["node","area"]},
@@ -11664,6 +12163,11 @@
 {"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "level","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Events venue","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_empty.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Internet Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_internet_cafe.png","key": "amenity","value": "internet_cafe","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Internet Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_internet_cafe.png","key": "name","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Internet Cafe","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_internet_cafe.png","key": "operator","object_types": ["node","area"]},
@@ -11717,6 +12221,9 @@
 {"description":"Facilities/Facilities/Trolley bay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_trolley_bay.png","key": "level","object_types": ["node","way","area"]},
 {"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "amenity","value": "vending_machine","object_types": ["node"]},
 {"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "vending","value": "bottle_return","object_types": ["node"]},
+{"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "recycling:cans","object_types": ["node"]},
+{"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "recycling:glass_bottles","object_types": ["node"]},
+{"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "recycling:plastic_bottles","object_types": ["node"]},
 {"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "name","object_types": ["node"]},
 {"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "operator","object_types": ["node"]},
 {"description":"Facilities/Facilities/Bottle return","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_bottle_return.png","key": "opening_hours","object_types": ["node"]},
@@ -11734,6 +12241,29 @@
 {"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:aluminium","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:batteries","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:beverage_cartons","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:cans","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:cardboard","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:clothes","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:coffee_capsules","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:cooking_oil","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:drugs","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:electrical_appliances","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:engine_oil","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:glass","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:glass_bottles","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:green_waste","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:paper","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:PET","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:plastic","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:plastic_bottles","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:plastic_packaging","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:scrap_metal","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:shoes","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:small_appliances","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Container","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:waste","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "amenity","value": "recycling","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling_type","value": "centre","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "name","object_types": ["node","area"]},
@@ -11743,6 +12273,29 @@
 {"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "wheelchair:step_height","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:aluminium","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:batteries","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:beverage_cartons","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:cans","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:cardboard","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:clothes","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:coffee_capsules","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:cooking_oil","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:drugs","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:electrical_appliances","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:engine_oil","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:glass","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:glass_bottles","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:green_waste","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:paper","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:PET","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:plastic","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:plastic_bottles","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:plastic_packaging","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:scrap_metal","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:shoes","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:small_appliances","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Recycling Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_recycling.png","key": "recycling:waste","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Waste Basket/Trash Can","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_waste_bin.png","key": "amenity","value": "waste_basket","object_types": ["node"]},
 {"description":"Facilities/Facilities/Waste Basket/Trash Can","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_waste_bin.png","key": "waste","object_types": ["node"]},
 {"description":"Facilities/Facilities/Waste Disposal/Dumpster","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_waste_disposal_12312.png","key": "amenity","value": "waste_disposal","object_types": ["node","area"]},
@@ -11772,6 +12325,9 @@
 {"description":"Facilities/Facilities/Waste transfer station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_garbage_truck.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Waste transfer station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_garbage_truck.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Sanitary Dump Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_sanitary_dump_station.png","key": "amenity","value": "sanitary_dump_station","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Sanitary Dump Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_sanitary_dump_station.png","key": "sanitary_dump_station:pump-out","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Sanitary Dump Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_sanitary_dump_station.png","key": "sanitary_dump_station:round_drain","object_types": ["node","area"]},
+{"description":"Facilities/Facilities/Sanitary Dump Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_sanitary_dump_station.png","key": "sanitary_dump_station:basin","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Sanitary Dump Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_sanitary_dump_station.png","key": "access","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Sanitary Dump Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_sanitary_dump_station.png","key": "fee","object_types": ["node","area"]},
 {"description":"Facilities/Facilities/Sanitary Dump Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/amenity_sanitary_dump_station.png","key": "operator","object_types": ["node","area"]},
@@ -12383,6 +12939,11 @@
 {"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:repair","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:courses","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:rental","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:filling","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:air_filling","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:nitrox_filling","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:trimix_filling","object_types": ["node","area"]},
+{"description":"Sports/Sport Facilities/Dive centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_scuba_diving_21080.png","key": "scuba_diving:oxygen_filling","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Ice rink","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_iceskating.png","key": "leisure","value": "ice_rink","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Ice rink","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_iceskating.png","key": "seasonal","object_types": ["node","area"]},
 {"description":"Sports/Sport Facilities/Ice rink","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_iceskating.png","key": "sport","value": "curling","object_types": ["node","area"]},
@@ -12544,6 +13105,14 @@
 {"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "sport","value": "climbing","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "name","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "leisure","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:boulder","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:sport","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:toprope","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:trad","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:multipitch","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:ice","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:mixed","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:deepwater","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:routes","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "ele","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Climbing site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:length","value": "8","object_types": ["node","way","area"]},
@@ -12826,6 +13395,14 @@
 {"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "sport","value": "climbing","object_types": ["node","way"]},
 {"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing","value": "route","object_types": ["node","way"]},
 {"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "name","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:boulder","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:sport","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:toprope","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:trad","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:multipitch","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:ice","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:mixed","object_types": ["node","way"]},
+{"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:deepwater","object_types": ["node","way"]},
 {"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:bolted","value": "yes","object_types": ["node","way"]},
 {"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:bolted","value": "no","object_types": ["node","way"]},
 {"description":"Sports/Sport/Climbing route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_climbing_21005.png","key": "climbing:bolted","value": "1","object_types": ["node","way"]},
@@ -13066,6 +13643,7 @@
 {"description":"Sports/Sport/Skiing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_skiing_downhill.png","key": "piste:grooming","value": "classic+skating","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Skiing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_skiing_downhill.png","key": "piste:grooming","value": "scooter","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Skiing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_skiing_downhill.png","key": "piste:grooming","value": "backcountry","object_types": ["node","way","area"]},
+{"description":"Sports/Sport/Skiing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_skiing_downhill.png","key": "piste:lit","object_types": ["node","way","area"]},
 {"description":"Sports/Sport/Shooting","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_shooting.png","key": "sport","value": "shooting","object_types": ["node","area"]},
 {"description":"Sports/Sport/Shooting","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_shooting.png","key": "name","object_types": ["node","area"]},
 {"description":"Sports/Sport/Shooting","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_shooting.png","key": "leisure","value": "pitch","object_types": ["node","area"]},
@@ -13075,6 +13653,8 @@
 {"description":"Sports/Sport/Shooting","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_shooting.png","key": "opening_hours","object_types": ["node","area"]},
 {"description":"Sports/Sport/Chess","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_chess_21153.png","key": "sport","value": "chess","object_types": ["node","area"]},
 {"description":"Sports/Sport/Chess","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_chess_21153.png","key": "name","object_types": ["node","area"]},
+{"description":"Sports/Sport/Chess","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_chess_21153.png","key": "leisure","object_types": ["node","area"]},
+{"description":"Sports/Sport/Chess","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_chess_21153.png","key": "playground","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Soccer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_soccer.png","key": "sport","value": "soccer","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Soccer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_soccer.png","key": "name","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Soccer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_soccer.png","key": "leisure","value": "pitch","object_types": ["node","area"]},
@@ -13110,6 +13690,11 @@
 {"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "leisure","value": "stadium","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "leisure","value": "sports_hall","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "surface","object_types": ["node","area"]},
+{"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "gaelic_games:hurling","object_types": ["node","area"]},
+{"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "gaelic_games:football","object_types": ["node","area"]},
+{"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "gaelic_games:camogie","object_types": ["node","area"]},
+{"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "gaelic_games:rounders","object_types": ["node","area"]},
+{"description":"Sports/Sport (Ball)/Gaelic Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_gaelic_games_21156.png","key": "gaelic_games:handball","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Rugby League","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_football_21036.png","key": "sport","value": "rugby_league","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Rugby League","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_football_21036.png","key": "name","object_types": ["node","area"]},
 {"description":"Sports/Sport (Ball)/Rugby League","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/sport_football_21036.png","key": "leisure","value": "pitch","object_types": ["node","area"]},
@@ -14559,11 +15144,27 @@
 {"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "name","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "height","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "operator","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:mobile_phone","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:radio","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:television","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:microwave","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:bos","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:satellite","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:amateur_radio","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Tower","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_tower_communications.png","key": "communication:gsm-r","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "man_made","value": "mast","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "tower:type","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "name","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "height","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "operator","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:mobile_phone","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:radio","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:television","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:microwave","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:bos","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:satellite","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:amateur_radio","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Mast","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_mast_22028.png","key": "communication:gsm-r","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Utility pole","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_pole.png","key": "man_made","value": "utility_pole","object_types": ["node"]},
 {"description":"Man Made/Man Made/Utility pole","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_pole.png","key": "height","object_types": ["node"]},
 {"description":"Man Made/Man Made/Utility pole","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_pole.png","key": "material","value": "concrete","object_types": ["node"]},
@@ -14590,6 +15191,14 @@
 {"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "name","object_types": ["node"]},
 {"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "height","object_types": ["node"]},
 {"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "operator","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:mobile_phone","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:radio","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:television","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:microwave","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:bos","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:satellite","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:amateur_radio","object_types": ["node"]},
+{"description":"Man Made/Man Made/Antenna","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_antenna_22088.png","key": "communication:gsm-r","object_types": ["node"]},
 {"description":"Man Made/Man Made/Flagpole","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_flagpole_22023.png","key": "man_made","value": "flagpole","object_types": ["node"]},
 {"description":"Man Made/Man Made/Flagpole","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_flagpole_22023.png","key": "flag:type","object_types": ["node"]},
 {"description":"Man Made/Man Made/Flagpole","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_flagpole_22023.png","key": "flag:type","value": "advertising","object_types": ["node"]},
@@ -15142,6 +15751,9 @@
 {"description":"Man Made/Man Made/Goods conveyor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_empty.png","key": "resource","value": "tin","object_types": ["way"]},
 {"description":"Man Made/Man Made/Goods conveyor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_empty.png","key": "resource","value": "zinc","object_types": ["way"]},
 {"description":"Man Made/Man Made/Goods conveyor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_empty.png","key": "resource","value": "zircon","object_types": ["way"]},
+{"description":"Man Made/Man Made/Goods conveyor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_empty.png","key": "covered","object_types": ["way"]},
+{"description":"Man Made/Man Made/Goods conveyor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_empty.png","key": "bridge","object_types": ["way"]},
+{"description":"Man Made/Man Made/Goods conveyor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_empty.png","key": "tunnel","object_types": ["way"]},
 {"description":"Man Made/Man Made/Goods conveyor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_empty.png","key": "layer","object_types": ["way"]},
 {"description":"Man Made/Man Made/Gantry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_gantry.png","key": "man_made","value": "gantry","object_types": ["way","area"]},
 {"description":"Man Made/Man Made/Gantry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_gantry.png","key": "maxheight:physical","object_types": ["way","area"]},
@@ -15510,6 +16122,25 @@
 {"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "man_made","value": "monitoring_station","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "name","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "operator","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:water_level","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:tide_gauge","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:groundwater","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:traffic","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:bicycle","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:pedestrian","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:air_quality","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:noise","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:gps","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:glonass","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:galileo","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:weather","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:radiation","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "monitoring:seismic_activity","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "recording:automated","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "recording:manually","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "recording:remote","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "display:analog","object_types": ["node","area"]},
+{"description":"Man Made/Man Made/Monitoring Station","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_monitoring_station_22042.png","key": "display:digital","object_types": ["node","area"]},
 {"description":"Man Made/Man Made/Survey Point","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_survey_point.png","key": "man_made","value": "survey_point","object_types": ["node"]},
 {"description":"Man Made/Man Made/Survey Point","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_survey_point.png","key": "name","object_types": ["node"]},
 {"description":"Man Made/Man Made/Survey Point","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/man_made_survey_point.png","key": "ref","object_types": ["node"]},
@@ -15653,7 +16284,6 @@
 {"description":"Man Made/Bridges/Bridge outline","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_bridge_sp.png","key": "bridge:support","value": "pylon","object_types": ["area"]},
 {"description":"Man Made/Bridges/Bridge outline","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_bridge_sp.png","key": "name","object_types": ["area"]},
 {"description":"Man Made/Bridges/Bridge outline","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_bridge_sp.png","key": "layer","object_types": ["area"]},
-{"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:source","value": "biofuel","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:source","value": "oil","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:source","value": "diesel","object_types": ["relation","area"]},
@@ -15671,6 +16301,7 @@
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:source","value": "wave","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:source","value": "solar","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:source","value": "wind","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "operator","object_types": ["relation","area"]},
@@ -15716,8 +16347,8 @@
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:output:vacuum","value": "5 MW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "plant:source","value": "biofuel","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "operator","object_types": ["relation","area"]},
@@ -15763,8 +16394,8 @@
 {"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "plant:output:vacuum","value": "5 MW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biofuel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biofuel_26006.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biogas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biogas_26007.png","key": "plant:source","value": "biogas","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Biogas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biogas_26007.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biogas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biogas_26007.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Biogas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biogas_26007.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biogas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biogas_26007.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biogas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biogas_26007.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biogas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biogas_26007.png","key": "operator","object_types": ["relation","area"]},
@@ -15857,8 +16488,8 @@
 {"description":"Man Made/Power/Power Plant/Biomass Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biomass_26008.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Biomass Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_biomass_26008.png","key": "plant:method","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:source","value": "coal","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "operator","object_types": ["relation","area"]},
@@ -15904,8 +16535,8 @@
 {"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:output:vacuum","value": "5 MW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Coal Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "plant:source","value": "gas","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "operator","object_types": ["relation","area"]},
@@ -15951,8 +16582,8 @@
 {"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "plant:output:vacuum","value": "5 MW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gas Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_gas.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "plant:source","value": "oil","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "operator","object_types": ["relation","area"]},
@@ -15998,8 +16629,8 @@
 {"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "plant:output:vacuum","value": "5 MW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Oil Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_oil_26025.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "plant:source","value": "diesel","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "operator","object_types": ["relation","area"]},
@@ -16045,8 +16676,8 @@
 {"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "plant:output:vacuum","value": "5 MW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Diesel Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_diesel_26025.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gasoline Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_gasoline_26022.png","key": "plant:source","value": "gasoline","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Gasoline Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_gasoline_26022.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gasoline Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_gasoline_26022.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Gasoline Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_gasoline_26022.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gasoline Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_gasoline_26022.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gasoline Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_gasoline_26022.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Gasoline Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_gasoline_26022.png","key": "operator","object_types": ["relation","area"]},
@@ -16468,8 +17099,8 @@
 {"description":"Man Made/Power/Power Plant/Solar Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_solar.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Solar Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_solar.png","key": "plant:method","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "plant:source","value": "wind","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "plant:method","object_types": ["relation","area"]},
+{"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "power","value": "plant","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "name","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "ref","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "operator","object_types": ["relation","area"]},
@@ -16514,7 +17145,6 @@
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "plant:output:vacuum","value": "3 kW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "plant:output:vacuum","value": "5 MW","object_types": ["relation","area"]},
 {"description":"Man Made/Power/Power Plant/Wind Power Plant","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_wind.png","key": "plant:output:vacuum","value": "7 GW","object_types": ["relation","area"]},
-{"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "power","value": "generator","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "generator:source","value": "biofuel","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "generator:source","value": "oil","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "generator:source","value": "diesel","object_types": ["node","area"]},
@@ -16532,6 +17162,7 @@
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "generator:source","value": "wave","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "generator:source","value": "solar","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "generator:source","value": "wind","object_types": ["node","area"]},
+{"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "power","value": "generator","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "name","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "ref","object_types": ["node","area"]},
 {"description":"Man Made/Power/Power Generator/Power Generator","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_station_coal.png","key": "operator","object_types": ["node","area"]},
@@ -17047,14 +17678,14 @@
 {"description":"Man Made/Power/Power Switchgear","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_switch_26041.png","key": "location","value": "surface","object_types": ["area"]},
 {"description":"Man Made/Power/Power Switchgear","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_switch_26041.png","key": "voltage","object_types": ["area"]},
 {"description":"Man Made/Power/Power Switchgear","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_switch_26041.png","key": "gas_insulated","object_types": ["area"]},
-{"description":"Man Made/Power/Power Busbar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_busbar_26004.png","key": "line","value": "busbar","object_types": ["way"]},
 {"description":"Man Made/Power/Power Busbar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_busbar_26004.png","key": "power","value": "line","object_types": ["way"]},
+{"description":"Man Made/Power/Power Busbar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_busbar_26004.png","key": "line","value": "busbar","object_types": ["way"]},
 {"description":"Man Made/Power/Power Busbar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_busbar_26004.png","key": "cables","object_types": ["way"]},
 {"description":"Man Made/Power/Power Busbar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_busbar_26004.png","key": "circuits","object_types": ["way"]},
 {"description":"Man Made/Power/Power Busbar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_busbar_26004.png","key": "voltage","object_types": ["way"]},
 {"description":"Man Made/Power/Power Busbar","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_busbar_26004.png","key": "frequency","object_types": ["way"]},
-{"description":"Man Made/Power/Power Bay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_26005.png","key": "line","value": "bay","object_types": ["way"]},
 {"description":"Man Made/Power/Power Bay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_26005.png","key": "power","value": "line","object_types": ["way"]},
+{"description":"Man Made/Power/Power Bay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_26005.png","key": "line","value": "bay","object_types": ["way"]},
 {"description":"Man Made/Power/Power Bay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_26005.png","key": "cables","object_types": ["way"]},
 {"description":"Man Made/Power/Power Bay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_26005.png","key": "circuits","object_types": ["way"]},
 {"description":"Man Made/Power/Power Bay","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_generator_26005.png","key": "voltage","object_types": ["way"]},
@@ -17278,7 +17909,6 @@
 {"description":"Man Made/Power/Pole with Switch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_switch.png","key": "switch","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Switch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_switch.png","key": "voltage","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Switch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_switch.png","key": "cables","object_types": ["node"]},
-{"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "transformer","value": "distribution","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "power","value": "pole","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "height","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "material","value": "concrete","object_types": ["node"]},
@@ -17306,6 +17936,7 @@
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "pole:type","value": "transposing","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "pole:type","value": "crossing","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "pole:type","value": "transition","object_types": ["node"]},
+{"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "transformer","value": "distribution","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "voltage:primary","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "voltage:secondary","object_types": ["node"]},
 {"description":"Man Made/Power/Pole with Transformer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/power_pole_with_transformer.png","key": "voltage:tertiary","object_types": ["node"]},
@@ -17608,8 +18239,8 @@
 {"description":"Historic Places & Objects/Archaeological Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_archaeological.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Historic Places & Objects/Archaeological Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_archaeological.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Historic Places & Objects/Archaeological Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_archaeological.png","key": "wheelchair:step_height","object_types": ["node","area"]},
-{"description":"Historic Places & Objects/Fortification Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_empty.png","key": "archaeological_site","value": "fortification","object_types": ["node","area"]},
 {"description":"Historic Places & Objects/Fortification Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_empty.png","key": "historic","value": "archaeological_site","object_types": ["node","area"]},
+{"description":"Historic Places & Objects/Fortification Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_empty.png","key": "archaeological_site","value": "fortification","object_types": ["node","area"]},
 {"description":"Historic Places & Objects/Fortification Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_empty.png","key": "fortification_type","value": "hill_fort","object_types": ["node","area"]},
 {"description":"Historic Places & Objects/Fortification Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_empty.png","key": "fortification_type","value": "limes","object_types": ["node","area"]},
 {"description":"Historic Places & Objects/Fortification Site","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/tourist_empty.png","key": "fortification_type","value": "sconce","object_types": ["node","area"]},
@@ -17920,6 +18551,11 @@
 {"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "organic","value": "only","object_types": ["node","area"]},
 {"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "organic","value": "yes","object_types": ["node","area"]},
 {"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "organic","value": "no","object_types": ["node","area"]},
+{"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Food/Supermarket","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_supermarket.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Food/Convenience Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_convenience.png","key": "shop","value": "convenience","object_types": ["node","area"]},
 {"description":"Shops/Food/Convenience Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_convenience.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Food/Convenience Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_convenience.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18009,6 +18645,11 @@
 {"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Food/Bakery","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_bakery.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "shop","value": "butcher","object_types": ["node","area"]},
 {"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "butcher","value": "beef","object_types": ["node","area"]},
 {"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "butcher","value": "horse","object_types": ["node","area"]},
@@ -18029,6 +18670,11 @@
 {"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Food/Butcher","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_butcher.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Food/Seafood","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_seafood_29126.png","key": "shop","value": "seafood","object_types": ["node","area"]},
 {"description":"Shops/Food/Seafood","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_seafood_29126.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Food/Seafood","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_seafood_29126.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18296,6 +18942,11 @@
 {"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "organic","value": "only","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "organic","value": "yes","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "organic","value": "no","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Clothes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_clothes.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "shop","value": "boutique","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "operator","object_types": ["node","area"]},
@@ -18353,6 +19004,11 @@
 {"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "clothes","value": "wedding","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "clothes","value": "women","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "clothes","value": "workwear","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Boutique","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_boutique.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fashion accessories","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fashion_accessories.png","key": "shop","value": "fashion_accessories","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fashion accessories","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fashion_accessories.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fashion accessories","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fashion_accessories.png","key": "operator","object_types": ["node","area"]},
@@ -18509,6 +19165,11 @@
 {"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "organic","value": "yes","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "organic","value": "no","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "shoes:repair","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Shoes","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoes_29128.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Shoe repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoemaker_16108.png","key": "shop","value": "shoe_repair","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Shoe repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoemaker_16108.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Shoe repair","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_shoemaker_16108.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18560,6 +19221,11 @@
 {"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Outdoor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_outdoor_29121.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Dry Cleaning","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "shop","value": "dry_cleaning","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Dry Cleaning","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Dry Cleaning","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18578,6 +19244,11 @@
 {"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "level","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "self_service","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "laundry_service","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Laundry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_laundrette.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "shop","value": "tailor","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18586,6 +19257,11 @@
 {"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Tailor","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tailor_16085.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "shop","value": "fabric","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "operator","object_types": ["node","area"]},
@@ -18595,6 +19271,11 @@
 {"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Clothes/Fabric","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_fabric_29050.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Electronics/Computer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_computer.png","key": "shop","value": "computer","object_types": ["node","area"]},
 {"description":"Shops/Electronics/Computer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_computer.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Electronics/Computer","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_computer.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18711,6 +19392,11 @@
 {"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Home furnishing and decoration/Furniture","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_furniture_29068.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Home furnishing and decoration/Electrical appliances","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_electrical.png","key": "shop","value": "appliance","object_types": ["node","area"]},
 {"description":"Shops/Home furnishing and decoration/Electrical appliances","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_electrical.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Home furnishing and decoration/Electrical appliances","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_electrical.png","key": "operator","object_types": ["node","area"]},
@@ -18917,6 +19603,11 @@
 {"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Copy Shop","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_copyshop.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "shop","value": "books","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "brand","object_types": ["node","area"]},
@@ -18931,6 +19622,11 @@
 {"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "second_hand","value": "only","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "second_hand","value": "yes","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "second_hand","value": "no","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Printed Material/Book Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_book.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Newspaper Stand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_kiosk.png","key": "shop","value": "newsagent","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Newspaper Stand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_kiosk.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Printed Material/Newspaper Stand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_kiosk.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18955,6 +19651,11 @@
 {"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/For the body/Chemist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_chemist_29025.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/For the body/Cosmetics","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_cosmetics_29040.png","key": "shop","value": "cosmetics","object_types": ["node","area"]},
 {"description":"Shops/For the body/Cosmetics","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_cosmetics_29040.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/For the body/Cosmetics","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_cosmetics_29040.png","key": "opening_hours","object_types": ["node","area"]},
@@ -18988,6 +19689,11 @@
 {"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/For the body/Beauty","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_beauty_29906.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/For the body/Nail salon","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_nail_salon_29108.png","key": "shop","value": "beauty","object_types": ["node","area"]},
 {"description":"Shops/For the body/Nail salon","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_nail_salon_29108.png","key": "beauty","value": "nails","object_types": ["node","area"]},
 {"description":"Shops/For the body/Nail salon","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_nail_salon_29108.png","key": "name","object_types": ["node","area"]},
@@ -19035,6 +19741,9 @@
 {"description":"Shops/For the body/Hairdresser/Barber","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hairdresser.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/For the body/Hairdresser/Barber","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hairdresser.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/For the body/Hairdresser/Barber","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hairdresser.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hairdresser/Barber","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hairdresser.png","key": "female","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hairdresser/Barber","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hairdresser.png","key": "male","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hairdresser/Barber","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hairdresser.png","key": "unisex","object_types": ["node","area"]},
 {"description":"Shops/For the body/Tattoo","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tattoo_29190.png","key": "shop","value": "tattoo","object_types": ["node","area"]},
 {"description":"Shops/For the body/Tattoo","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tattoo_29190.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/For the body/Tattoo","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_tattoo_29190.png","key": "opening_hours","object_types": ["node","area"]},
@@ -19051,6 +19760,11 @@
 {"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/For the body/Optician","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/health_opticians.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "shop","value": "hearing_aids","object_types": ["node","area"]},
 {"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "operator","object_types": ["node","area"]},
@@ -19060,6 +19774,11 @@
 {"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/For the body/Hearing Aids","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_hearing_aids.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/For the body/Medical Supply","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_medical_supply_29183.png","key": "shop","value": "medical_supply","object_types": ["node","area"]},
 {"description":"Shops/For the body/Medical Supply","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_medical_supply_29183.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/For the body/Medical Supply","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_medical_supply_29183.png","key": "operator","object_types": ["node","area"]},
@@ -19206,6 +19925,11 @@
 {"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:repair","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:courses","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:rental","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:filling","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:air_filling","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:nitrox_filling","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:trimix_filling","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Scuba diving","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_scuba_diving_29044.png","key": "scuba_diving:oxygen_filling","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "shop","value": "sewing","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "opening_hours","object_types": ["node","area"]},
@@ -19214,6 +19938,11 @@
 {"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Sports and hobbies/Sewing","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_dressmaker_16111.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "shop","value": "department_store","object_types": ["node","area"]},
 {"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "operator","object_types": ["node","area"]},
@@ -19249,6 +19978,11 @@
 {"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "changing_table:location","value": "sales_area","object_types": ["node","area"]},
 {"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "toilets:wheelchair","object_types": ["node","area"]},
 {"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "toilets:access","object_types": ["node","area"]},
+{"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Department Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "shop","value": "mall","object_types": ["node","area"]},
 {"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "operator","object_types": ["node","area"]},
@@ -19284,6 +20018,11 @@
 {"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "changing_table:location","value": "sales_area","object_types": ["node","area"]},
 {"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "toilets:wheelchair","object_types": ["node","area"]},
 {"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "toilets:access","object_types": ["node","area"]},
+{"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Mall","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_department_store.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "shop","value": "baby_goods","object_types": ["node","area"]},
 {"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "opening_hours","object_types": ["node","area"]},
@@ -19295,6 +20034,11 @@
 {"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "brand","object_types": ["node","area"]},
 {"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "brand:wikipedia","object_types": ["node","area"]},
 {"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "brand:wikidata","object_types": ["node","area"]},
+{"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Baby goods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_baby_goods_29161.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "shop","value": "florist","object_types": ["node","area"]},
 {"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "opening_hours","object_types": ["node","area"]},
@@ -19303,6 +20047,11 @@
 {"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Florist","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_florist.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "shop","value": "garden_centre","object_types": ["node","area"]},
 {"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "brand","object_types": ["node","area"]},
@@ -19314,6 +20063,11 @@
 {"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Garden Centre","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_garden_centre.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "shop","value": "doityourself","object_types": ["node","area"]},
 {"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "brand","object_types": ["node","area"]},
@@ -19325,6 +20079,11 @@
 {"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Do-It-Yourself Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "shop","value": "hardware","object_types": ["node","area"]},
 {"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "opening_hours","object_types": ["node","area"]},
@@ -19333,6 +20092,11 @@
 {"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Hardware","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_diy.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Trade supplies","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_trade_29143.png","key": "shop","value": "trade","object_types": ["node","area"]},
 {"description":"Shops/Other/Trade supplies","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_trade_29143.png","key": "trade","value": "building_supplies","object_types": ["node","area"]},
 {"description":"Shops/Other/Trade supplies","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_trade_29143.png","key": "trade","value": "plumbing","object_types": ["node","area"]},
@@ -19445,6 +20209,11 @@
 {"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Second hand","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_second_hand_29127.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Charity","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_charity_29024.png","key": "shop","value": "charity","object_types": ["node","area"]},
 {"description":"Shops/Other/Charity","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_charity_29024.png","key": "second_hand","value": "only","object_types": ["node","area"]},
 {"description":"Shops/Other/Charity","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_charity_29024.png","key": "second_hand","value": "yes","object_types": ["node","area"]},
@@ -19467,6 +20236,11 @@
 {"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Travel Agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_travel_agency_29144.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Musical Instrument","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_musical_instrument_29107.png","key": "shop","value": "musical_instrument","object_types": ["node","area"]},
 {"description":"Shops/Other/Musical Instrument","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_musical_instrument_29107.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Musical Instrument","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_musical_instrument_29107.png","key": "operator","object_types": ["node","area"]},
@@ -19484,6 +20258,11 @@
 {"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Toys","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_toys.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "shop","value": "games","object_types": ["node","area"]},
 {"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "opening_hours","object_types": ["node","area"]},
@@ -19492,6 +20271,11 @@
 {"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "level","object_types": ["node","area"]},
+{"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Games","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_games.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Watches","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_watchmaker_16090.png","key": "shop","value": "watches","object_types": ["node","area"]},
 {"description":"Shops/Other/Watches","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_watchmaker_16090.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Watches","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_watchmaker_16090.png","key": "opening_hours","object_types": ["node","area"]},
@@ -19575,6 +20359,11 @@
 {"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "denomination","value": "united_methodist","object_types": ["node","area"]},
 {"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "denomination","value": "vaishnavism","object_types": ["node","area"]},
 {"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "denomination","value": "vajrayana","object_types": ["node","area"]},
+{"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Shops/Other/Gift/Souvenir","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_gift.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Shops/Other/Variety Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_variety_store_29148.png","key": "shop","value": "variety_store","object_types": ["node","area"]},
 {"description":"Shops/Other/Variety Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_variety_store_29148.png","key": "name","object_types": ["node","area"]},
 {"description":"Shops/Other/Variety Store","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_variety_store_29148.png","key": "operator","object_types": ["node","area"]},
@@ -19832,11 +20621,60 @@
 {"description":"Shops/Vending Machine","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_vending_machine.png","key": "ref","object_types": ["node"]},
 {"description":"Shops/Vending Machine","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/shopping_vending_machine.png","key": "level","object_types": ["node"]},
 {"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:cash","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:coins","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:notes","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:debit_cards","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:bancomat","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:bankaxept","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:girocard","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:gpn_debit","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:laser","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:maestro","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:postfinance_card","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:v_pay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:visa_debit","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:visa_electron","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:cb","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:credit_cards","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:american_express","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:diners_club","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:discover_card","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:jcb","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:mastercard","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:visa","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:contactless","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:qr_code","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:app","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:electronic_purses","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_avant","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_beep","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_brizzi","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_bsbcash","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_flazz","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_geldkarte","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_mandiri_emoney","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_megacash","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_mep","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_minicash","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_minipay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_monedero","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_monedero4b","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_nobu_emoney","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:ep_tapcash","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:akulaku","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:alipay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:apple_pay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:clover","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:google_pay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:grabpay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:huawei_pay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:samsung_pay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:satispay","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:twint","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:wechat","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:cryptocurrencies","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:bitcoin","object_types": ["node","way","relation","area"]},
+{"description":"Shops/Payment Methods","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_payment_methods.png","key": "payment:litecoin","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Cash withdrawal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_cash_withdrawal.png","key": "cash_withdrawal","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Cash withdrawal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_cash_withdrawal.png","key": "cash_withdrawal:operator","object_types": ["node","way","relation","area"]},
 {"description":"Shops/Cash withdrawal","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_cash_withdrawal.png","key": "cash_withdrawal:type","object_types": ["node","way","relation","area"]},
@@ -19861,6 +20699,11 @@
 {"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "branch","object_types": ["node","area"]},
 {"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "atm","object_types": ["node","area"]},
 {"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "ref","object_types": ["node","area"]},
+{"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "kids_area","object_types": ["node","area"]},
+{"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "kids_area:indoor","object_types": ["node","area"]},
+{"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "kids_area:outdoor","object_types": ["node","area"]},
+{"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "kids_area:supervised","object_types": ["node","area"]},
+{"description":"Money/Bank","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_bank2.png","key": "kids_area:fee","object_types": ["node","area"]},
 {"description":"Money/Money Exchange","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_currency_exchange.png","key": "amenity","value": "bureau_de_change","object_types": ["node","area"]},
 {"description":"Money/Money Exchange","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_currency_exchange.png","key": "name","object_types": ["node","area"]},
 {"description":"Money/Money Exchange","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/money_currency_exchange.png","key": "opening_hours","object_types": ["node","area"]},
@@ -21213,64 +22056,64 @@
 {"description":"Relations/Turn Restrictions/Turn Restriction","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Turn Restriction","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Turn Restriction","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "restriction","value": "no_left_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "restriction","value": "no_left_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No left turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_left_turn.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "restriction","value": "no_right_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "restriction","value": "no_right_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No right turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_right_turn.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "restriction","value": "no_u_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "restriction","value": "no_u_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No U turn","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_u_turn.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "restriction","value": "only_left_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "restriction","value": "only_left_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Left turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_left_turn.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "restriction","value": "only_right_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "restriction","value": "only_right_turn","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Right turn only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_right_turn.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "restriction","value": "only_straight_on","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "restriction","value": "only_straight_on","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/Straight on only","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/only_straight_on.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "restriction","value": "no_straight_on","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "restriction","value": "no_straight_on","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No straight on","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_straight_on.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "restriction","value": "no_entry","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "restriction","value": "no_entry","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "hgv","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "motorcar","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No entry","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "psv","object_types": ["relation"]},
-{"description":"Relations/Turn Restrictions/No exit","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "restriction","value": "no_exit","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No exit","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "type","value": "restriction","object_types": ["relation"]},
+{"description":"Relations/Turn Restrictions/No exit","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "restriction","value": "no_exit","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No exit","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No exit","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "emergency","object_types": ["relation"]},
 {"description":"Relations/Turn Restrictions/No exit","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/no_entry.png","key": "except","value": "hgv","object_types": ["relation"]},
@@ -21290,11 +22133,11 @@
 {"description":"Relations/Enforcement","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_speed_camera_18025.png","key": "maxspeed","object_types": ["relation"]},
 {"description":"Relations/Enforcement","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_speed_camera_18025.png","key": "maxweight","object_types": ["relation"]},
 {"description":"Relations/Enforcement","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_speed_camera_18025.png","key": "mindistance","object_types": ["relation"]},
-{"description":"Relations/Enforcement (average speed)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_speed_camera_18025.png","key": "enforcement","value": "average_speed","object_types": ["relation"]},
 {"description":"Relations/Enforcement (average speed)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_speed_camera_18025.png","key": "type","value": "enforcement","object_types": ["relation"]},
+{"description":"Relations/Enforcement (average speed)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_speed_camera_18025.png","key": "enforcement","value": "average_speed","object_types": ["relation"]},
 {"description":"Relations/Enforcement (average speed)","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_speed_camera_18025.png","key": "maxspeed","object_types": ["relation"]},
-{"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "bicycle","object_types": ["relation"]},
 {"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
 {"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "icn","object_types": ["relation"]},
@@ -21313,8 +22156,8 @@
 {"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Bicycle Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "mtb","object_types": ["relation"]},
 {"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "mtb","object_types": ["relation"]},
 {"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network:type","object_types": ["relation"]},
 {"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
@@ -21328,8 +22171,8 @@
 {"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Mountain Biking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "hiking","object_types": ["relation"]},
 {"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "hiking","object_types": ["relation"]},
 {"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
 {"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "iwn","object_types": ["relation"]},
@@ -21348,8 +22191,8 @@
 {"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Hiking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "foot","object_types": ["relation"]},
 {"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "foot","object_types": ["relation"]},
 {"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
 {"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "rwn","object_types": ["relation"]},
@@ -21366,8 +22209,8 @@
 {"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Walking Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "running","object_types": ["relation"]},
 {"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "running","object_types": ["relation"]},
 {"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network:type","object_types": ["relation"]},
 {"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
@@ -21381,8 +22224,8 @@
 {"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Running Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "fitness_trail","object_types": ["relation"]},
 {"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "fitness_trail","object_types": ["relation"]},
 {"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network:type","object_types": ["relation"]},
 {"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
@@ -21396,8 +22239,8 @@
 {"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Fitness Trail","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "horse","object_types": ["relation"]},
 {"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "horse","object_types": ["relation"]},
 {"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
 {"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "ihn","object_types": ["relation"]},
@@ -21416,8 +22259,8 @@
 {"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Riding Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "piste","object_types": ["relation"]},
 {"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "piste","object_types": ["relation"]},
 {"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "piste:type","object_types": ["relation"]},
 {"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "piste:type","value": "connection","object_types": ["relation"]},
@@ -21442,8 +22285,8 @@
 {"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Piste Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "ski","object_types": ["relation"]},
 {"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "ski","object_types": ["relation"]},
 {"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "piste:type","object_types": ["relation"]},
 {"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "piste:type","value": "nordic","object_types": ["relation"]},
@@ -21460,8 +22303,8 @@
 {"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Ski Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "inline_skates","object_types": ["relation"]},
 {"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "inline_skates","object_types": ["relation"]},
 {"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
 {"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "international","object_types": ["relation"]},
 {"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "national","object_types": ["relation"]},
@@ -21480,30 +22323,30 @@
 {"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "roundtrip","object_types": ["relation"]},
 {"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "symbol","object_types": ["relation"]},
 {"description":"Relations/Routes/Inline Skating Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "description","object_types": ["relation"]},
-{"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "detour","object_types": ["relation"]},
 {"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "detour","object_types": ["relation"]},
 {"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "operator","object_types": ["relation"]},
 {"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "destination","object_types": ["relation"]},
 {"description":"Relations/Routes/Detour Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "detour","object_types": ["relation"]},
-{"description":"Relations/Routes/Power Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "power","object_types": ["relation"]},
 {"description":"Relations/Routes/Power Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Power Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "power","object_types": ["relation"]},
 {"description":"Relations/Routes/Power Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Power Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Relations/Routes/Power Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "operator","object_types": ["relation"]},
-{"description":"Relations/Routes/Pipeline route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "pipeline","object_types": ["relation"]},
 {"description":"Relations/Routes/Pipeline route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Pipeline route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "pipeline","object_types": ["relation"]},
 {"description":"Relations/Routes/Pipeline route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Pipeline route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Relations/Routes/Pipeline route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "operator","object_types": ["relation"]},
-{"description":"Relations/Routes/Railway Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "railway","object_types": ["relation"]},
 {"description":"Relations/Routes/Railway Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Railway Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "railway","object_types": ["relation"]},
 {"description":"Relations/Routes/Railway Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Railway Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Relations/Routes/Railway Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "operator","object_types": ["relation"]},
-{"description":"Relations/Routes/Road Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "road","object_types": ["relation"]},
 {"description":"Relations/Routes/Road Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "route","object_types": ["relation"]},
+{"description":"Relations/Routes/Road Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "route","value": "road","object_types": ["relation"]},
 {"description":"Relations/Routes/Road Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Routes/Road Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "ref","object_types": ["relation"]},
 {"description":"Relations/Routes/Road Route","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
@@ -21528,8 +22371,8 @@
 {"description":"Relations/Route Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","object_types": ["relation"]},
 {"description":"Relations/Route Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "name","object_types": ["relation"]},
 {"description":"Relations/Route Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "operator","object_types": ["relation"]},
-{"description":"Relations/Node Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network:type","value": "node_network","object_types": ["relation"]},
 {"description":"Relations/Node Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "type","value": "network","object_types": ["relation"]},
+{"description":"Relations/Node Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network:type","value": "node_network","object_types": ["relation"]},
 {"description":"Relations/Node Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "icn","object_types": ["relation"]},
 {"description":"Relations/Node Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "ncn","object_types": ["relation"]},
 {"description":"Relations/Node Network","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/osm_route_sp.png","key": "network","value": "rcn","object_types": ["relation"]},
@@ -22125,8 +22968,8 @@
 {"description":"Offices/Advertising agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_advertising_agency_25002.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Offices/Advertising agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_advertising_agency_25002.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Advertising agency","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_advertising_agency_25002.png","key": "level","object_types": ["node","area"]},
-{"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic","value": "embassy","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "office","value": "diplomatic","object_types": ["node","area"]},
+{"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic","value": "embassy","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "embassy","value": "branch_embassy","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "embassy","value": "delegation","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "embassy","value": "high_commission","object_types": ["node","area"]},
@@ -22137,14 +22980,17 @@
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "country","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "name","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "target","object_types": ["node","area"]},
+{"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:non-immigrant_visas","object_types": ["node","area"]},
+{"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:immigrant_visas","object_types": ["node","area"]},
+{"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:citizen_services","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "opening_hours","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Embassy","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "level","object_types": ["node","area"]},
-{"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic","value": "consulate","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "office","value": "diplomatic","object_types": ["node","area"]},
+{"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic","value": "consulate","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "consulate","value": "consular_agency","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "consulate","value": "consular_office","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "consulate","value": "consulate_general","object_types": ["node","area"]},
@@ -22152,20 +22998,26 @@
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "country","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "name","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "target","object_types": ["node","area"]},
+{"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:non-immigrant_visas","object_types": ["node","area"]},
+{"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:immigrant_visas","object_types": ["node","area"]},
+{"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:citizen_services","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "opening_hours","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair:description","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair:entrance_width","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair:step_height","object_types": ["node","area"]},
 {"description":"Offices/Consulate","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "level","object_types": ["node","area"]},
-{"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic","value": "liaison","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "office","value": "diplomatic","object_types": ["node","area"]},
+{"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic","value": "liaison","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "liaison","value": "liaison_office","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "liaison","value": "representative_office","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "liaison","value": "subnational","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "country","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "name","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "target","object_types": ["node","area"]},
+{"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:non-immigrant_visas","object_types": ["node","area"]},
+{"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:immigrant_visas","object_types": ["node","area"]},
+{"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "diplomatic:services:citizen_services","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "opening_hours","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair","object_types": ["node","area"]},
 {"description":"Offices/Liaison","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/office_government_25006.png","key": "wheelchair:description","object_types": ["node","area"]},