Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 4581)
+++ trunk/data/defaultpresets.xml	(revision 4584)
@@ -1010,5 +1010,5 @@
         </item>
         <item name="City Limit" icon="presets/citylimit.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign=city_limit"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_sign" />
             <label text="Edit City Limit Sign" />
@@ -1020,5 +1020,5 @@
         </item>
         <item name="Speed Camera" icon="presets/speed_camera.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=speed_camera"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=speed_camera"
@@ -1028,5 +1028,5 @@
         <separator/>
         <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grit_bin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grit_bin"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=grit_bin"
@@ -1400,5 +1400,5 @@
         </item>
          <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dgroyne"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=groyne"
@@ -1747,5 +1747,5 @@
         </item>
         <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=buffer_stop" />
             <key key="railway" value="buffer_stop" />
@@ -2236,5 +2236,5 @@
         <separator/>
         <item name="Ticket Machine" de.name="Fahrausweisautomat" icon="presets/vending_machine.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dvending_machine"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
@@ -2326,5 +2326,5 @@
         </item>
         <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
@@ -2384,4 +2384,5 @@
         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:tourism=motel"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:tourism=motel" />
             <label text="Edit Motel" />
@@ -2735,5 +2736,5 @@
         </item>
         <item name="Information Board" icon="presets/board.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:information=board"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Proposed_features/information"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Proposed_features/information" />
@@ -2788,5 +2789,5 @@
         </item>
         <item name="Other Information Points" icon="presets/information.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:tourism=information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
@@ -2878,5 +2879,5 @@
         </item>
         <item name="Public Grill" icon="presets/bbq.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=bbq"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bbq"
@@ -2968,5 +2969,5 @@
         </item>
         <item name="Recording Studio" icon="presets/studio.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=studio" />
             <label text="Edit Studio" />
@@ -3002,7 +3003,8 @@
         </item>
         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway">      	
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dcommunity_centre"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=community_centre"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=community_centre"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=community_centre"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=community_centre"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=community_centre" />
@@ -3142,4 +3144,5 @@
         <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=doctors" />
             <label text="Edit Doctors" />
@@ -3176,5 +3179,5 @@
         </item>
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"/>
             <label text="Edit Hearing Aids" />
@@ -3309,5 +3312,5 @@
         </item>
         <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=waste_basket"
@@ -3429,5 +3432,5 @@
     <group name="Sport" icon="presets/rowing.png">
         <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dmulti" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
             <label text="Edit Multi" />
             <key key="sport" value="multi" />
@@ -3436,5 +3439,6 @@
         </item>
         <item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3D9pin" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
             <label text="Edit 9pin" />
             <key key="sport" value="9pin" />
@@ -3443,5 +3447,5 @@
         </item>
         <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3D10pin" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
             <label text="Edit 10pin" />
             <key key="sport" value="10pin" />
@@ -3450,5 +3454,5 @@
         </item>
         <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Darchery" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery" />
             <label text="Edit Archery" />
             <key key="sport" value="archery" />
@@ -3457,5 +3461,5 @@
         </item>
         <item name="Athletics" icon="presets/athletics.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sports%3Dathletics" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <label text="Edit Athletics" />
             <key key="sport" value="athletics" />
@@ -3464,5 +3468,5 @@
         </item>
         <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dclimbing" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing" />
             <label text="Edit Climbing" />
             <key key="sport" value="climbing" />
@@ -3471,5 +3475,5 @@
         </item>
         <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dcanoe" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <label text="Edit Canoeing" />
             <key key="sport" value="canoe" />
@@ -3477,5 +3481,5 @@
         </item>
         <item name="Cycling" icon="presets/cycling.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dcycling" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <label text="Edit Cycling" />
             <key key="sport" value="cycling" />
@@ -3484,5 +3488,5 @@
         </item>
         <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Ddog_racing" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
             <label text="Edit Dog Racing" />
             <key key="sport" value="dog_racing" />
@@ -3491,5 +3495,5 @@
         </item>
         <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dequestrian" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
             <label text="Edit Equestrian" />
             <key key="sport" value="equestrian" />
@@ -3498,5 +3502,5 @@
         </item>
         <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dhorse_racing" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <label text="Edit Horse Racing" />
             <key key="sport" value="horse_racing" />
@@ -3505,5 +3509,5 @@
         </item>
         <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dgymnastics" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
             <label text="Edit Gymnastics" />
             <key key="sport" value="gymnastics" />
@@ -3512,5 +3516,6 @@
         </item>
         <item name="Skating" icon="presets/skating.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dskating" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
             <label text="Edit Skating" />
             <key key="sport" value="skating" />
@@ -3519,5 +3524,6 @@
         </item>
         <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dskateboard" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
             <label text="Edit Skateboard" />
             <key key="sport" value="skateboard" />
@@ -3526,5 +3532,6 @@
         </item>
         <item name="Swimming" icon="presets/swimming.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dswimming" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
             <label text="Edit Swimming" />
             <key key="sport" value="swimming" />
@@ -3554,5 +3561,7 @@
     <group name="Sport (Ball)" icon="presets/soccer.png">
         <item name="Soccer" icon="presets/soccer.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dsoccer"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=soccer"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=soccer"/>
             <label text="Edit Soccer" />
             <key key="sport" value="soccer" />
@@ -3561,5 +3570,5 @@
         </item>
         <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Daustralian_football"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football"/>
             <label text="Edit Australian Football" />
             <key key="sport" value="australian_football" />
@@ -3568,5 +3577,5 @@
         </item>
         <item name="American Football" icon="presets/football.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Damerican_football"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football"/>
             <label text="Edit American Football" />
             <key key="sport" value="american_football" />
@@ -3575,5 +3584,5 @@
         </item>
         <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dcanadian_football"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football"/>
             <label text="Edit Canadian Football" />
             <key key="sport" value="canadian_football" />
@@ -3582,5 +3591,5 @@
         </item>
         <item name="Gaelic Football" icon="presets/soccer.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dgaelic_games"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games"/>
             <label text="Edit Gaelic Football" />
             <key key="sport" value="gaelic_football" />
@@ -3589,5 +3598,6 @@
         </item>
         <item name="Rugby League" icon="presets/football.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Drugby_league"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league"/>
             <label text="Edit Rugby League" />
             <key key="sport" value="rugby_league" />
@@ -3596,5 +3606,6 @@
         </item>
         <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Drugby_union"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union"/>
             <label text="Edit Rugby Union" />
             <key key="sport" value="rugby_union" />
@@ -3603,5 +3614,5 @@
         </item>
         <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbaseball"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball"/>
             <label text="Edit Baseball" />
             <key key="sport" value="baseball" />
@@ -3610,5 +3621,5 @@
         </item>
         <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbasketball"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball"/>
             <label text="Edit Basketball" />
             <key key="sport" value="basketball" />
@@ -3617,5 +3628,5 @@
         </item>
         <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">         	
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dvolleyball" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
             <label text="Edit Volleyball" />
             <space />            
@@ -3626,5 +3637,5 @@
         </item> 
         <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbeachvolleyball" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
             <label text="Edit Beachvolleyball" />
             <space />            
@@ -3635,5 +3646,7 @@
         </item> 
         <item name="Golf" icon="presets/golf.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dgolf"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=golf"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf"/>
             <label text="Edit Golf" />
             <key key="sport" value="golf" />
@@ -3642,5 +3655,5 @@
         </item>
         <item name="Boule" icon="presets/boule.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dboules"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules"/>
             <label text="Edit Boule" />
             <key key="sport" value="boules" />
@@ -3649,5 +3662,5 @@
         </item>
         <item name="Bowls" icon="presets/boule.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dbowls"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls"/>
             <label text="Edit Bowls" />
             <key key="sport" value="bowls" />
@@ -3656,5 +3669,5 @@
         </item>
         <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dcricket"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket"/>
             <label text="Edit Cricket" />
             <key key="sport" value="cricket" />
@@ -3663,5 +3676,5 @@
         </item>
         <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dcricket_nets"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets"/>
             <label text="Edit Cricket Nets" />
             <key key="sport" value="cricket_nets" />
@@ -3670,5 +3683,5 @@
         </item>
         <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dcroquet"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet"/>
             <label text="Edit Croquet" />
             <key key="sport" value="croquet" />
@@ -3677,5 +3690,5 @@
         </item>
         <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dhockey"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey"/>
             <label text="Edit Hockey" />
             <key key="sport" value="hockey" />
@@ -3684,5 +3697,6 @@
         </item>
         <item name="Pelota" icon="presets/pelota.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dpelota"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota"/>
             <label text="Edit Pelota" />
             <key key="sport" value="pelota" />
@@ -3691,5 +3705,6 @@
         </item>
         <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dracquet"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet"/>
             <label text="Edit Racquet" />
             <key key="sport" value="racquet" />
@@ -3698,5 +3713,5 @@
         </item>
         <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dtable_tennis"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis"/>
             <label text="Edit Table Tennis" />
             <key key="sport" value="table_tennis" />
@@ -3705,5 +3720,5 @@
         </item>
         <item name="Tennis" icon="presets/tennis.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport%3Dtennis"/>
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis"/>
             <label text="Edit Tennis" />
             <key key="sport" value="tennis" />
@@ -3791,4 +3806,5 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=windmill"
+                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:man_made=windmill"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill" />
             <label text="Edit Windmill" />
@@ -3821,5 +3837,5 @@
         </item>
         <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=mineshaft"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=mineshaft" />
@@ -3835,5 +3851,5 @@
         </item>
         <item name="Adit" icon="presets/adit.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dadit"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=adit"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=adit"
@@ -3854,5 +3870,5 @@
         </item>
         <item name="Water Works" icon="presets/water_works.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_works"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_works"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works" />
@@ -3875,5 +3891,5 @@
         </item>
         <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=watermill"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
@@ -3888,4 +3904,5 @@
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fountain"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fountain"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=fountain"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fountain" />
@@ -3895,5 +3912,5 @@
         </item>
         <item name="Water Well" icon="presets/water_well.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwater_well"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=water_well"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_well" />
@@ -3921,5 +3938,5 @@
         </item>
         <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node">         	
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstreet_lamp"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
             <label text="Edit Street Lamp" />
@@ -4007,5 +4024,5 @@
         </item>
         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power%3Dcable_distribution_cabinet"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable_distribution_cabinet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable_distribution_cabinet"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=cable_distribution_cabinet" />
@@ -4029,5 +4046,5 @@
         </item>
         <item name="Pole" icon="styles/standard/misc/landmark/power/pole.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power%3Dpole"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:power=pole"
@@ -4175,5 +4192,5 @@
         </item>
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dseafood"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood"/>
             <label text="Edit Seafood" />
@@ -4185,5 +4202,5 @@
         </item>
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddeli"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=deli"/>
             <label text="Edit Deli (Fine Food)" />
@@ -4195,5 +4212,5 @@
         </item>                     
         <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=confectionery"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=confectionery"
@@ -4206,5 +4223,5 @@
         <separator/>
         <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=marketplace"
@@ -4221,5 +4238,5 @@
         </item>     	
         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dgreengrocer"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=greengrocer"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=greengrocer"
@@ -4262,5 +4279,5 @@
         </item>
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=boutique"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=boutique"/>
@@ -4317,5 +4334,5 @@
         </item>
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=fabric"/>
             <label text="Edit Fabric" />
@@ -4341,5 +4358,5 @@
         </item>
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mobile_phone"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mobile_phone"/>
@@ -4352,5 +4369,5 @@
         </item>                                     
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"/>
             <label text="Edit Vacuum Cleaner" />
@@ -4420,5 +4437,5 @@
     <group name="Other" icon="styles/standard/shop/mall.png">
         <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=department_store"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=department_store"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=department_store"
@@ -4432,5 +4449,5 @@
         </item>                                  
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mall"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=mall"/>
@@ -4462,5 +4479,5 @@
         </item>
         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"/>
             <label text="Edit Jewelry" />
@@ -4472,5 +4489,5 @@
         </item>                               
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Derotic"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"/>
             <label text="Edit Erotic" />
@@ -4523,5 +4540,5 @@
         </item>
         <item name="Paint" icon="presets/paint.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dpaint"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=paint"/>
             <label text="Edit Paint" />
@@ -4540,5 +4557,5 @@
         </item>
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dkitchen"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=kitchen"/>
             <label text="Edit Kitchen" />
@@ -4550,5 +4567,5 @@
         </item>                   
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcurtain"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=curtain"/>
             <label text="Edit Curtain" />
@@ -4560,5 +4577,5 @@
         </item>                     
         <item name="Frame" icon="presets/frame.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dframe"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=frame"/>
             <label text="Edit Frames" />
@@ -4577,5 +4594,5 @@
         </item>
         <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dcopyshop"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=copyshop"/>
             <label text="Edit Copyshop" />
@@ -4600,5 +4617,5 @@
         </item>
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmusical_instrument"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=musical_instrument"/>
             <label text="Edit Musical Instruments" />
@@ -4616,5 +4633,5 @@
         </item>
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvariety_store"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=variety_store"/>
             <label text="Edit Variety Store" />
@@ -4950,5 +4967,5 @@
         </item>
         <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse%3Dgreenhouse_horticulture"
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenhouse_horticulture" />
             <label text="Edit Greenhouse Horticulture" />
@@ -5055,5 +5072,5 @@
         </item>
         <item name="Garages" icon="presets/garages.png" type="closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse%3Dgarages"
+            <link href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=garages"
                   en.href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=garages"