--- data/defaultpresets.xml
+++ data/defaultpresets.xml
@@ -161,268 +161,269 @@
  - keyvalue: positive if key and value matches, negative otherwise
 Note that for a match, at least one positive and no negative is required.
 -->
-    <!-- Item chunks -->
-    <chunk id="surface">
-        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
-    </chunk>
-    <chunk id="highway_base">
-        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3"/>
-        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
-        <text key="maxspeed" text="Max. speed (km/h)"/>
-        <reference ref="surface" />
-    </chunk>
-    <chunk id="highway_yesno_incline">
-        <check key="bridge" text="Bridge" disable_off="true" />
-        <check key="tunnel" text="Tunnel" disable_off="true" />
-        <check key="cutting" text="Cutting" disable_off="true" />
-        <check key="embankment" text="Embankment" disable_off="true" />
-        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
-    </chunk>
-    <chunk id="highway_yesno_incline_oneway">
-        <check key="oneway" text="Oneway" />
-        <reference ref="highway_yesno_incline" />
-    </chunk>
-    <chunk id="highway_yesno_incline_oneway_lit">
-        <reference ref="highway_yesno_incline_oneway" />
-        <check key="lit" text="Lit" />
-    </chunk>
-    <chunk id="highway_yesno_incline_oneway_lit_width">
-        <reference ref="highway_yesno_incline_oneway_lit" />
-        <text key="width" text="Width (meters)" />
-    </chunk>
-    <chunk id="railway_service">
-        <combo key="service" text="Service type" values="yard,siding,spur" />
-    </chunk>
-    <chunk id="railway_electrified">
-        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
-        <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
-        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
-    </chunk>
-    <chunk id="railway_service_gauge_electrified">
-        <reference ref="railway_service" />
-        <combo key="tracks" text="Tracks" text_context="railway" values="1,2,3,4" length="4" />
-        <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
-        <reference ref="railway_electrified" />
-    </chunk>
-    <chunk id="barrier_5">
-        <optional text="Allowed traffic:">
-            <check key="foot" text="Foot" default="on"/>
-            <check key="bicycle" text="Bicycle" default="on"/>
-            <check key="horse" text="Horse" />
-            <check key="motorcycle" text="Motorcycle" />
-            <check key="motorcar" text="Motorcar" />
-        </optional>
-    </chunk>
-    <chunk id="barrier_4">
-        <optional text="Allowed traffic:">
-            <check key="foot" text="Foot" default="on"/>
-            <check key="bicycle" text="Bicycle" default="on"/>
-            <check key="horse" text="Horse" />
-            <check key="motorcycle" text="Motorcycle" />
-        </optional>
-    </chunk>
-    <chunk id="barrier_2">
-        <optional text="Allowed traffic:">
-            <check key="foot" text="Foot" default="on"/>
-            <check key="bicycle" text="Bicycle" default="on"/>
-        </optional>
-    </chunk>
-    <chunk id="contact">
-        <text key="phone" text="Phone Number"/>
-        <text key="fax" text="Fax Number"/>
-        <text key="website" text="Website"/>
-    <text key="email" text="Email Address"/>
-    </chunk>
-    <chunk id="name_ref">
-        <text key="name" text="Name" />
-        <text key="ref" text="Reference" />
-    </chunk>
-    <chunk id="name_ref_operator">
-        <text key="name" text="Name" />
-        <text key="ref" text="Reference" />
-        <text key="operator" text="Operator" />
-    </chunk>
-    <chunk id="name_operator">
-        <text key="name" text="Name" />
-        <text key="operator" text="Operator" />
-    </chunk>
-    <chunk id="name_layer">
-        <text key="name" text="Name" />
-        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-    </chunk>
-    <chunk id="service_times">
-        <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-    </chunk>
-    <chunk id="oh">
-        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
-    </chunk>
-    <chunk id="name_oh">
-        <text key="name" text="Name" />
-        <reference ref="oh" />
-    </chunk>
-    <chunk id="name_operator_oh">
-        <reference ref="name_operator" />
-        <reference ref="oh" />
-    </chunk>
-    <chunk id="name_brand_operator_oh">
-        <text key="name" text="Name" />
-        <text key="brand" text="Brand" />
-        <text key="operator" text="Operator" />
-        <reference ref="oh" />
-    </chunk>
-    <chunk id="name_brand_oh">
-        <text key="name" text="Name" />
-        <text key="brand" text="Brand" />
-        <reference ref="oh" />
-    </chunk>
-    <chunk id="internet_smoking_wheelchair">
-        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
-    </chunk>
-    <chunk id="optional_height">
-        <optional>
-            <text key="height" text="Height (meters)" length="7" />
-        </optional>
-    </chunk>
-    <chunk id="optional_maxwidth">
-        <optional>
-            <text key="maxwidth" text="Max. width (meters)" length="7" />
-        </optional>
-    </chunk>
-    <chunk id="optional_maxheight_maxwidth">
-        <optional>
-            <text key="maxheight" text="Max. height (meters)" length="7" />
-            <text key="maxwidth" text="Max. width (meters)" length="7" />
-        </optional>
-    </chunk>
-    <chunk id="name_leisure_pitch">
-        <text key="name" text="Name" />
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
-    </chunk>
-    <chunk id="payment_base">
-        <check key="payment:coins" text="Coins" />
-        <check key="payment:notes" text="Notes" />
-        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
-        <check key="payment:debit_cards" text="Debit cards" />
-        <check key="payment:credit_cards" text="Credit cards" />
-    </chunk>
-    <chunk id="payment_account">
-        <reference ref="payment_base" />
-        <check key="payment:account_cards" text="Account or loyalty cards" />
-    </chunk>
-    <chunk id="parking_name_type_ref">
-        <text key="name" text="Name" />
-        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-        <text key="ref" text="Reference number" />
-    </chunk>
-    <chunk id="parking_access_fee_operator_surface">
-        <space />
-        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
-        <combo key="fee" text="Fee" values="yes,no,interval" />
-        <text key="operator" text="Operator" />
-        <reference ref="surface" />
-        <space />
-    </chunk>
-    <chunk id="stay">
-        <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
-    </chunk>
-    <chunk id="supervised_lit_oh">
-        <combo key="supervised" text="Supervised" values="yes,no,interval" />
-        <combo key="lit" text="Lit" values="yes,no,interval" />
-        <reference ref="oh" />
-    </chunk>
-    <chunk id="general_access">
-        <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
-    </chunk>
-    <chunk id="name_wikipedia">
-        <text key="name" text="Name" />
-        <text key="wikipedia" text="Wikipedia" />
-    </chunk>
-    <chunk id="population_postcode_website">
-        <text key="population" text="Population" />
-        <text key="addr:postcode" text="Post code" />
-        <text key="website" text="Website" />
-    </chunk>
-    <chunk id="route_hikebike_optionals">
-        <text key="distance" text="Distance (km)"/>
-        <text key="ascent" text="Ascent (m)"/>
-        <text key="descent" text="Descent (m)"/>
-        <check key="roundtrip" text="Roundtrip"/>
-        <text key="symbol" text="Symbol description"/>
-        <text key="description" text="Description"/>
-    </chunk>
-    <chunk id="leaf">
-        <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" />
-        <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" />
-    </chunk>
-    <chunk id="religious">
-        <text key="name" text="Name" />
-        <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
-        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
-    </chunk>
-    <chunk id="voltage">
-        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
-    </chunk>
-    <chunk id="frequency">
-        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
-    </chunk>
-    <chunk id="voltage_frequency">
-        <reference ref="voltage" />
-        <reference ref="frequency" />
-    </chunk>
-    <chunk id="ref_operator_branch">
-        <text key="ref" text="Reference" />
-        <text key="operator" text="Operator" />
-        <text key="branch" text="Branch operator" />
-    </chunk>
-    <chunk id="cable_circuit">
-        <combo key="cables" text="Amount of Cables" values="1,3,6,9,12" lenght="2" />
-        <combo key="circuits" text="Amount of circuits" values="1,2,3" lenght="2" />
-    </chunk>
-    <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
-    </chunk>
-    <chunk id="power_extra">
-        <reference ref="power_loc" />
-        <reference ref="voltage_frequency" />
-        <reference ref="ref_operator_branch" />
-    </chunk>
-    <chunk id="power_line_extra">
-        <reference ref="cable_circuit" />
-        <reference ref="voltage_frequency" />
-    </chunk>
-    <chunk id="power_generator">
-        <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
-              de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
-              fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
-              it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=generator"
-              ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=generator"
-              pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=generator"
-              pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
-              ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
-        <space />
-        <key key="power" value="generator" />
-        <reference ref="name_ref_operator" />
-        <text key="branch" text="Branch operator" />
-        <text key="start_date" text="Start date" />
-    </chunk>
-    <chunk id="power_output">
-        <optional text="Output forms of energy:">
-            <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
-            <space />
-            <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
-        </optional>
-    </chunk>
+  <!-- Item chunks -->
+  <chunk id="surface">
+      <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
+  </chunk>
+  <chunk id="highway_base">
+      <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+      <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
+      <text key="maxspeed" text="Max. speed (km/h)" />
+      <reference ref="surface" />
+  </chunk>
+  <chunk id="highway_yesno_incline">
+      <check key="bridge" text="Bridge" disable_off="true" />
+      <check key="tunnel" text="Tunnel" disable_off="true" />
+      <check key="cutting" text="Cutting" disable_off="true" />
+      <check key="embankment" text="Embankment" disable_off="true" />
+      <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+  </chunk>
+  <chunk id="highway_yesno_incline_oneway">
+      <check key="oneway" text="Oneway" />
+      <reference ref="highway_yesno_incline" />
+  </chunk>
+  <chunk id="highway_yesno_incline_oneway_lit">
+      <reference ref="highway_yesno_incline_oneway" />
+      <check key="lit" text="Lit" />
+  </chunk>
+  <chunk id="highway_yesno_incline_oneway_lit_width">
+      <reference ref="highway_yesno_incline_oneway_lit" />
+      <text key="width" text="Width (meters)" />
+  </chunk>
+  <chunk id="railway_service">
+      <combo key="service" text="Service type" values="yard,siding,spur" />
+  </chunk>
+  <chunk id="railway_electrified">
+      <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" />
+      <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
+      <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+  </chunk>
+  <chunk id="railway_service_gauge_electrified">
+      <reference ref="railway_service" />
+      <combo key="tracks" text="Tracks" text_context="railway" values="1,2,3,4" length="4" />
+      <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
+      <reference ref="railway_electrified" />
+  </chunk>
+  <chunk id="barrier_5">
+      <optional text="Allowed traffic:">
+          <check key="foot" text="Foot" default="on" />
+          <check key="bicycle" text="Bicycle" default="on" />
+          <check key="horse" text="Horse" />
+          <check key="motor_vehicle" text="Motor vehicles" />
+          <check key="motorcycle" text="Motorcycle" />
+          <check key="motorcar" text="Motorcar" />
+      </optional>
+  </chunk>
+  <chunk id="barrier_4">
+      <optional text="Allowed traffic:">
+          <check key="foot" text="Foot" default="on" />
+          <check key="bicycle" text="Bicycle" default="on" />
+          <check key="horse" text="Horse" />
+          <check key="motorcycle" text="Motorcycle" />
+      </optional>
+  </chunk>
+  <chunk id="barrier_2">
+      <optional text="Allowed traffic:">
+          <check key="foot" text="Foot" default="on" />
+          <check key="bicycle" text="Bicycle" default="on" />
+      </optional>
+  </chunk>
+  <chunk id="contact">
+      <text key="phone" text="Phone Number" />
+      <text key="fax" text="Fax Number" />
+      <text key="website" text="Website" />
+  <text key="email" text="Email Address" />
+  </chunk>
+  <chunk id="name_ref">
+      <text key="name" text="Name" />
+      <text key="ref" text="Reference" />
+  </chunk>
+  <chunk id="name_ref_operator">
+      <text key="name" text="Name" />
+      <text key="ref" text="Reference" />
+      <text key="operator" text="Operator" />
+  </chunk>
+  <chunk id="name_operator">
+      <text key="name" text="Name" />
+      <text key="operator" text="Operator" />
+  </chunk>
+  <chunk id="name_layer">
+      <text key="name" text="Name" />
+      <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+  </chunk>
+  <chunk id="service_times">
+      <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+  </chunk>
+  <chunk id="oh">
+      <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+  </chunk>
+  <chunk id="name_oh">
+      <text key="name" text="Name" />
+      <reference ref="oh" />
+  </chunk>
+  <chunk id="name_operator_oh">
+      <reference ref="name_operator" />
+      <reference ref="oh" />
+  </chunk>
+  <chunk id="name_brand_operator_oh">
+      <text key="name" text="Name" />
+      <text key="brand" text="Brand" />
+      <text key="operator" text="Operator" />
+      <reference ref="oh" />
+  </chunk>
+  <chunk id="name_brand_oh">
+      <text key="name" text="Name" />
+      <text key="brand" text="Brand" />
+      <reference ref="oh" />
+  </chunk>
+  <chunk id="internet_smoking_wheelchair">
+      <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
+      <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+      <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
+      <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+  </chunk>
+  <chunk id="optional_height">
+      <optional>
+          <text key="height" text="Height (meters)" length="7" />
+      </optional>
+  </chunk>
+  <chunk id="optional_maxwidth">
+      <optional>
+          <text key="maxwidth" text="Max. width (meters)" length="7" />
+      </optional>
+  </chunk>
+  <chunk id="optional_maxheight_maxwidth">
+      <optional>
+          <text key="maxheight" text="Max. height (meters)" length="7" />
+          <text key="maxwidth" text="Max. width (meters)" length="7" />
+      </optional>
+  </chunk>
+  <chunk id="name_leisure_pitch">
+      <text key="name" text="Name" />
+      <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+  </chunk>
+  <chunk id="payment_base">
+      <check key="payment:coins" text="Coins" />
+      <check key="payment:notes" text="Notes" />
+      <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
+      <check key="payment:debit_cards" text="Debit cards" />
+      <check key="payment:credit_cards" text="Credit cards" />
+  </chunk>
+  <chunk id="payment_account">
+      <reference ref="payment_base" />
+      <check key="payment:account_cards" text="Account or loyalty cards" />
+  </chunk>
+  <chunk id="parking_name_type_ref">
+      <text key="name" text="Name" />
+      <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
+      <text key="ref" text="Reference number" />
+  </chunk>
+  <chunk id="parking_access_fee_operator_surface">
+      <space />
+      <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+      <combo key="fee" text="Fee" values="yes,no,interval" />
+      <text key="operator" text="Operator" />
+      <reference ref="surface" />
+      <space />
+  </chunk>
+  <chunk id="stay">
+      <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
+  </chunk>
+  <chunk id="supervised_lit_oh">
+      <combo key="supervised" text="Supervised" values="yes,no,interval" />
+      <combo key="lit" text="Lit" values="yes,no,interval" />
+      <reference ref="oh" />
+  </chunk>
+  <chunk id="general_access">
+      <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
+  </chunk>
+  <chunk id="name_wikipedia">
+      <text key="name" text="Name" />
+      <text key="wikipedia" text="Wikipedia" />
+  </chunk>
+  <chunk id="population_postcode_website">
+      <text key="population" text="Population" />
+      <text key="addr:postcode" text="Post code" />
+      <text key="website" text="Website" />
+  </chunk>
+  <chunk id="route_hikebike_optionals">
+      <text key="distance" text="Distance (km)" />
+      <text key="ascent" text="Ascent (m)" />
+      <text key="descent" text="Descent (m)" />
+      <check key="roundtrip" text="Roundtrip" />
+      <text key="symbol" text="Symbol description" />
+      <text key="description" text="Description" />
+  </chunk>
+  <chunk id="leaf">
+      <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" />
+      <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" />
+  </chunk>
+  <chunk id="religious">
+      <text key="name" text="Name" />
+      <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+      <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
+  </chunk>
+  <chunk id="voltage">
+      <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,20000,15000,high,medium,low,750000;200000,110000;20000" />
+  </chunk>
+  <chunk id="frequency">
+      <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+  </chunk>
+  <chunk id="voltage_frequency">
+      <reference ref="voltage" />
+      <reference ref="frequency" />
+  </chunk>
+  <chunk id="ref_operator_branch">
+      <text key="ref" text="Reference" />
+      <text key="operator" text="Operator" />
+      <text key="branch" text="Branch operator" />
+  </chunk>
+  <chunk id="cable_circuit">
+      <combo key="cables" text="Amount of Cables" values="1,3,6,9,12" lenght="2" />
+      <combo key="circuits" text="Amount of circuits" values="1,2,3" lenght="2" />
+  </chunk>
+  <chunk id="power_loc">
+      <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
+  </chunk>
+  <chunk id="power_extra">
+      <reference ref="power_loc" />
+      <reference ref="voltage_frequency" />
+      <reference ref="ref_operator_branch" />
+  </chunk>
+  <chunk id="power_line_extra">
+      <reference ref="cable_circuit" />
+      <reference ref="voltage_frequency" />
+  </chunk>
+  <chunk id="power_generator">
+      <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
+            de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
+            fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator"
+            it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:power=generator"
+            ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:power=generator"
+            pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:power=generator"
+            pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=generator"
+            ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=generator" />
+      <space />
+      <key key="power" value="generator" />
+      <reference ref="name_ref_operator" />
+      <text key="branch" text="Branch operator" />
+      <text key="start_date" text="Start date" />
+  </chunk>
+  <chunk id="power_output">
+      <optional text="Output forms of energy:">
+          <combo key="generator:output:biogas" text="biogas" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:electricity" text="electricity" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:hot_water" text="hot water" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:hot_air" text="hot air" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:cold_water" text="cold water" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:cold_air" text="cold air" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:compressed_air" text="compressed air" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:steam" text="steam" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
+          <space />
+          <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
+      </optional>
+  </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact">
     <preset_link preset_name="Contact (common schema)" />
@@ -1733,16 +1734,18 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         </item>
         <separator/>
-        <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
+        <item name="Spring" icon="presets/spring.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=spring"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=spring"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=spring"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=spring"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
+            <label text="A point where groundwater naturally flows to the surface of the earth from underground." />
             <space />
             <key key="natural" value="spring" />
             <text key="name" text="Name" />
+            <check key="drinking_water" text="Drinking Water" />
         </item>
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
             <space />
@@ -1835,19 +1838,18 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=water"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=water"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=water"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=water"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
+            <label text="A body of standing water, such as a lake or pond." />
             <space />
             <key key="natural" value="water" />
             <text key="name" text="Name" />
             <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
+            <check key="salt" text="Salt Water" disable_off="true" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
         </item>
-        <item name="Land" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
-            <space />
-            <key key="natural" value="land" />
-            <text key="name" text="Name" />
-        </item>
-        <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation" preset_name_label="true">
+        <item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=coastline"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=coastline"
@@ -1855,6 +1857,7 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=coastline"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=coastline"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
+            <label text="Line between the sea and land (with the water on the right side of the way)." />
             <space />
             <key key="natural" value="coastline" />
             <text key="name" text="Name" />
@@ -1875,7 +1878,7 @@
             <text key="name" text="Name" />
         </item>
         <separator/>
-        <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=wetland"
@@ -1886,14 +1889,19 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wetland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
+            <label text="Waterlogged area, either permanently or seasonally with vegetation." />
             <space />
             <key key="natural" value="wetland" />
             <text key="name" text="Name" />
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
         </item>
-        <item name="Mud" icon="presets/mud.png" type="node,closedway,relation" preset_name_label="true">
-            <key key="natural" value="mud" />
+        <item name="Mud" icon="presets/mud.png" type="closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=mud"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=mud" />
+            <label text="Large area covered with mud." />
             <space />
+            <key key="natural" value="mud" />
             <text key="name" text="Name" />
         </item>
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
@@ -1903,11 +1911,25 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=beach"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=beach"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
+            <label text="A flat area of sand, gravel or pebble next to water." />
             <space />
             <key key="natural" value="beach" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
+            <optional>
+              <combo key="supervised" text="Supervised" values="yes,no,interval" />
+              <reference ref="oh" />
+              <reference ref="general_access" />
+              <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
+              <combo key="sport" text="Sport" values="swimming,surfing" />
+            </optional>
         </item>
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=bay"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bay"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=bay"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=bay" />
+            <label text="A large body of water partially enclosed by land but with a wide mouth." />
             <space />
             <key key="natural" value="bay" />
             <text key="name" text="Name" />
@@ -1919,11 +1941,12 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=cliff"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cliff"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
+            <label text="A steep rock face exposure, with a significant vertical, or near vertical (leave the lower face to the right of the way)." />
             <space />
             <key key="natural" value="cliff" />
             <text key="name" text="Name" />
         </item>
-      </group> <!-- Water -->
+    </group> <!-- Water -->
     <group name="Shipping" icon="presets/ferry.png">
         <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
@@ -6418,6 +6441,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=peak"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:natural=peak" />
+            <label text="The top (summit) of a mountain or hill." />
             <space />
             <key key="natural" value="peak" />
             <reference ref="name_wikipedia" />
@@ -6428,40 +6452,51 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
+            <label text="A saddle point between mountains or hills." />
             <space/>
             <key key="natural" value="saddle" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
         </item>
-        <item name="Glacier" icon="presets/glacier.png" type="node,closedway" preset_name_label="true">
+        <item name="Glacier" icon="presets/glacier.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=glacier"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=glacier"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
+            <label text="A persistent body of dense ice that is constantly moving under its own weight." />
             <space />
             <key key="natural" value="glacier" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
         </item>
-        <item name="Volcano" icon="presets/volcano.png" type="node,closedway" preset_name_label="true">
+        <item name="Volcano" icon="presets/volcano.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=volcano"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=volcano" />
+            <label text="A volcano, either dormant, extinct or active." />
             <space />
             <key key="natural" value="volcano" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
+            <optional>
+              <combo key="volcano:status" text="Current Status" values="active,dormant,extinct" />
+              <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
+            </optional>
         </item>
-        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
+        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cave_entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=cave_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance" />
+            <label text="The entrance to a cave." />
             <space />
             <key key="natural" value="cave_entrance" />
             <reference ref="name_wikipedia" />
+            <reference ref="oh" />
+            <reference ref="general_access" />
+            <combo key="fee" text="Fee" values="yes,no" />
         </item>
         <separator/>
         <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
@@ -6483,6 +6518,16 @@
             <key key="place" value="islet" />
             <reference ref="name_wikipedia" />
         </item>
+        <item name="Ridge" icon="presets/empty.png" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
+            <label text="A mountain or hill ridge." />
+            <space />
+            <key key="natural" value="ridge" />
+            <reference ref="name_wikipedia" />
+            <text key="ele" text="Elevation" />
+        </item>
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/tree.png">
         <item name="Tree" icon="presets/tree.png" type="node" preset_name_label="true">
@@ -6495,6 +6540,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=tree"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
+            <label text="A single tree." />
             <space />
             <key key="natural" value="tree" />
             <text key="name" text="Name" />
@@ -6516,7 +6562,10 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=tree_row"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree_row"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" />
+            <label text="A line of trees." />
+            <space />
             <key key="natural" value="tree_row" />
+            <text key="height" text="Height in meter (m)" />
             <optional>
                 <reference ref="leaf" />
             </optional>
@@ -6528,6 +6577,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=wood"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
+            <label text="Woodland where timber production does not dominate use." />
             <space />
             <key key="natural" value="wood" />
             <text key="name" text="Name" />
@@ -6546,7 +6596,7 @@
             <text key="name" text="Name" />
             <reference ref="leaf" />
         </item>
-        <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Grassland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=grassland"
@@ -6555,6 +6605,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=grassland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=grassland"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=grassland" />
+            <label text="Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-woody) plants. Excludes cultivated areas and wetlands." />
             <space />
             <key key="natural" value="grassland" />
             <text key="name" text="Name" />
@@ -6567,6 +6618,13 @@
         </item>
         <separator/>
         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=scree"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=scree"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scree"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=scree" />
+            <label text="An accumulation of loose rocks." />
             <space />
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
@@ -6577,14 +6635,26 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=fell"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
+            <label text="Bare upper lying uncultivated land principally covered with grass and often grazed." />
             <space />
             <key key="natural" value="fell" />
             <text key="name" text="Name" />
         </item>
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=scrub"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=scrub"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scrub"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=scrub"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=scrub" />
+            <label text="Bare lower lying uncultivated land with bushes but little or no tree cover." />
             <space />
             <key key="natural" value="scrub" />
             <text key="name" text="Name" />
+            <optional>
+              <reference ref="leaf" />
+            </optional>
         </item>
         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
@@ -6593,6 +6663,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=heath"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=heath"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
+            <label text="Bare lower lying uncultivated land with a shrubland habitat found mainly on free-draining infertile, acidic soils, and is characterised by open, low-growing woody vegetation." />
             <space />
             <key key="natural" value="heath" />
             <text key="name" text="Name" />
@@ -6601,10 +6672,34 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=sand" />
+            <label text="Large area covered with sand." />
             <space />
             <key key="natural" value="sand" />
             <text key="name" text="Name" />
         </item>
+        <item name="Bare Rock" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bare_rock"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=bare_rock"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bare_rock" />
+            <label text="For areas of solid visible rock that is sparsely vegetated or not vegetated at all." />
+            <space />
+            <key key="natural" value="bare_rock" />
+            <text key="name" text="Name" />
+        </item>
+        <item name="Stone" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=stone"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=stone"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=stone"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=stone" />
+            <label text="A single notable free-standing rock, which may differ from the composition of the terrain it lies in." />
+            <space />
+            <key key="natural" value="bare_rock" />
+            <reference ref="name_wikipedia" />
+            <optional>
+              <text key="height" text="Height (meters)" length="7" />
+              <text key="width" text="Width (meters)" />
+            </optional>
+        </item>    
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">
         <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
@@ -6888,497 +6983,497 @@
         </item>
     </group> <!-- Landuse -->
   </group>
-    <group name="Annotation" icon="presets/addresses.png">
-        <item name="Name" icon="presets/message.png" type="node,way,closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:name"
-                  ar.href="http://wiki.openstreetmap.org/wiki/Ar:Key:name"
-                  ca.href="http://wiki.openstreetmap.org/wiki/Ca:Key:name"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:name"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:name"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:name"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:name"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:name"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:name"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:name"
-                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:name"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:name"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:name"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:name"
-                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Key:name"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:name"
-                  zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:name" />
-            <space />
-            <text key="name" text="Name" />
-            <optional>
-                <text key="alt_name" text="Alternative name" match="key" />
-                <text key="old_name" text="Historical name" match="key" />
-                <text key="loc_name" text="Local name" match="key" />
-                <text key="reg_name" text="Regional name" match="key" />
-                <text key="nat_name" text="National name" match="key" />
-                <text key="int_name" text="International name" match="key" />
-                <text key="official_name" text="Official name" match="key" />
-                <text key="short_name" text="Common name abbreviation" match="key" />
-            </optional>
-        </item>
-        <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:addr"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Key:addr"
-                  et.href="http://wiki.openstreetmap.org/wiki/Et:Key:addr"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:addr"
-                  hr.href="http://wiki.openstreetmap.org/wiki/Hr:Key:addr"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:addr"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:addr"
-                  nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:addr"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr"
-                  vi.href="http://wiki.openstreetmap.org/wiki/Vi:Key:addr" />
-            <space />
-            <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
-            <optional>
-                <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
-                <text key="addr:street" text="Street name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
-                <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
-                <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
-                <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
-            </optional>
-        </item>
-        <item name="Address Interpolation" icon="presets/interpolation.png" type="way" preset_name_label="true">
-           <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
-                 de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
-                 es.href="http://wiki.openstreetmap.org/wiki/ES:Key:addr"
-                 et.href="http://wiki.openstreetmap.org/wiki/Et:Key:addr"
-                 fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:addr"
-                 hr.href="http://wiki.openstreetmap.org/wiki/Hr:Key:addr"
-                 it.href="http://wiki.openstreetmap.org/wiki/IT:Key:addr"
-                 ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:addr"
-                 nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:addr"
-                 pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
-                 pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
-                 ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
-            <space />
-            <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" />
-            <optional>
-                <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
-            </optional>
-        </item>
-        <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
-            <space />
-            <text key="phone" text="Phone Number" match="key" />
-            <text key="fax" text="Fax Number" match="key" />
-            <space />
-            <text key="website" text="Website" match="key" />
-            <text key="email" text="Email Address" match="key" />
-            <space />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="image" text="Image" />
-        </item>
-        <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:contact"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:contact"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:contact"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:contact"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:contact"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:contact"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:contact" />
-            <space />
-            <text key="contact:phone" text="Phone Number" match="key" />
-            <text key="contact:fax" text="Fax Number" match="key" />
-            <space />
-            <text key="contact:website" text="Website" match="key" />
-            <text key="contact:email" text="Email Address" match="key" />
-            <space />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="image" text="Image" />
-        </item>
-    </group> <!-- Annotation -->
-    <group name="Relations" icon="presets/relations.png">
-        <item name="Multipolygon" icon="presets/multipolygon.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Relation:multipolygon"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:multipolygon"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:multipolygon"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:multipolygon"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:multipolygon"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon" />
-            <key key="type" value="multipolygon" />
-            <optional>
-                <text key="name" text="Name" />
-            </optional>
-            <roles>
-                <role key="outer" text="outer segment" requisite="required" type="way" />
-                <role key="inner" text="inner segment" requisite="optional" type="way" />
-            </roles>
-        </item>
-        <item name="Boundary" icon="presets/boundaries.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:boundary"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:boundary"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
-            <space />
-            <key key="type" value="boundary" />
-            <text key="name" text="Name" />
-            <optional>
-                <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" values_searchable="true" />
-                <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
-            </optional>
-            <roles>
-                <role key="outer" text="outer segment" requisite="required" type="way" />
-                <role key="inner" text="inner segment" requisite="optional" type="way" />
-                <role key="subarea" text="Sub area" requisite="optional" type="relation" />
-                <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />
-                <role key="label" text="Label point" requisite="optional" type="node" count="1" />
-            </roles>
-        </item>
-        <item name="Site" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:site"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:site"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:site"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:site" />
-            <space />
-            <key key="type" value="site" />
-            <text key="name" text="Site name" />
-            <roles>
-                <role key="label" text="where to place the label" requisite="optional" type="node" />
-                <role key="perimeter" text="perimeter of the site" requisite="optional" type="closedway,relation" />
-                <role key="entrance" text="entrances to the site, on the perimeter" requisite="optional" type="node" />
-                <role key="" text="members of site" requisite="optional" type="node,way,closedway,relation" />
-            </roles>
-        </item>
-        <separator/>
-        <item name="Turn restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:restriction"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:restriction"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:restriction"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:restriction"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:restriction"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Relation:restriction"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction" />
-            <space />
-            <key key="type" value="restriction" />
-            <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" values_searchable="true" />
+  <group name="Annotation" icon="presets/addresses.png">
+      <item name="Name" icon="presets/message.png" type="node,way,closedway,relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Key:name"
+                ar.href="http://wiki.openstreetmap.org/wiki/Ar:Key:name"
+                ca.href="http://wiki.openstreetmap.org/wiki/Ca:Key:name"
+                cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:name"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Key:name"
+                es.href="http://wiki.openstreetmap.org/wiki/ES:Key:name"
+                fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:name"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:name"
+                it.href="http://wiki.openstreetmap.org/wiki/IT:Key:name"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:name"
+                nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:name"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:name"
+                pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:name"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:name"
+                sv.href="http://wiki.openstreetmap.org/wiki/Sv:Key:name"
+                uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:name"
+                zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:name" />
+          <space />
+          <text key="name" text="Name" />
+          <optional>
+              <text key="alt_name" text="Alternative name" match="key" />
+              <text key="old_name" text="Historical name" match="key" />
+              <text key="loc_name" text="Local name" match="key" />
+              <text key="reg_name" text="Regional name" match="key" />
+              <text key="nat_name" text="National name" match="key" />
+              <text key="int_name" text="International name" match="key" />
+              <text key="official_name" text="Official name" match="key" />
+              <text key="short_name" text="Common name abbreviation" match="key" />
+          </optional>
+      </item>
+      <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
+                cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:addr"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
+                es.href="http://wiki.openstreetmap.org/wiki/ES:Key:addr"
+                et.href="http://wiki.openstreetmap.org/wiki/Et:Key:addr"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:addr"
+                hr.href="http://wiki.openstreetmap.org/wiki/Hr:Key:addr"
+                it.href="http://wiki.openstreetmap.org/wiki/IT:Key:addr"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:addr"
+                nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:addr"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
+                pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr"
+                vi.href="http://wiki.openstreetmap.org/wiki/Vi:Key:addr" />
+          <space />
+          <text key="addr:housenumber" text="House number" match="key" auto_increment="-2,-1,+1,+2" />
+          <optional>
+              <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
+              <text key="addr:street" text="Street name" use_last_as_default="force" match="key" alternative_autocomplete_keys="name" />
+              <text key="addr:city" text="City name" use_last_as_default="force" match="key" />
+              <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
+              <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
+          </optional>
+      </item>
+      <item name="Address Interpolation" icon="presets/interpolation.png" type="way" preset_name_label="true">
+         <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
+               de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
+               es.href="http://wiki.openstreetmap.org/wiki/ES:Key:addr"
+               et.href="http://wiki.openstreetmap.org/wiki/Et:Key:addr"
+               fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:addr"
+               hr.href="http://wiki.openstreetmap.org/wiki/Hr:Key:addr"
+               it.href="http://wiki.openstreetmap.org/wiki/IT:Key:addr"
+               ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:addr"
+               nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:addr"
+               pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:addr"
+               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:addr"
+               ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:addr" />
+          <space />
+          <combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all,alphabetic" default="odd" match="key" />
+          <optional>
+              <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
+          </optional>
+      </item>
+      <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
+          <space />
+          <text key="phone" text="Phone Number" match="key" />
+          <text key="fax" text="Fax Number" match="key" />
+          <space />
+          <text key="website" text="Website" match="key" />
+          <text key="email" text="Email Address" match="key" />
+          <space />
+          <text key="wikipedia" text="Wikipedia" />
+          <text key="image" text="Image" />
+      </item>
+      <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
+                cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:contact"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Key:contact"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:contact"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:contact"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:contact"
+                pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:contact"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:contact" />
+          <space />
+          <text key="contact:phone" text="Phone Number" match="key" />
+          <text key="contact:fax" text="Fax Number" match="key" />
+          <space />
+          <text key="contact:website" text="Website" match="key" />
+          <text key="contact:email" text="Email Address" match="key" />
+          <space />
+          <text key="wikipedia" text="Wikipedia" />
+          <text key="image" text="Image" />
+      </item>
+  </group> <!-- Annotation -->
+  <group name="Relations" icon="presets/relations.png">
+      <item name="Multipolygon" icon="presets/multipolygon.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
+                cs.href="http://wiki.openstreetmap.org/wiki/Cs:Relation:multipolygon"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
+                es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:multipolygon"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon"
+                it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:multipolygon"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:multipolygon"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:multipolygon"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon" />
+          <key key="type" value="multipolygon" />
+          <optional>
+              <text key="name" text="Name" />
+          </optional>
+          <roles>
+              <role key="outer" text="outer segment" requisite="required" type="way" />
+              <role key="inner" text="inner segment" requisite="optional" type="way" />
+          </roles>
+      </item>
+      <item name="Boundary" icon="presets/boundaries.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
+                es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:boundary"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:boundary"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
+          <space />
+          <key key="type" value="boundary" />
+          <text key="name" text="Name" />
+          <optional>
+              <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" values_searchable="true" />
+              <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
+          </optional>
+          <roles>
+              <role key="outer" text="outer segment" requisite="required" type="way" />
+              <role key="inner" text="inner segment" requisite="optional" type="way" />
+              <role key="subarea" text="Sub area" requisite="optional" type="relation" />
+              <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />
+              <role key="label" text="Label point" requisite="optional" type="node" count="1" />
+          </roles>
+      </item>
+      <item name="Site" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:site"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:site"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:site"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:site" />
+          <space />
+          <key key="type" value="site" />
+          <text key="name" text="Site name" />
+          <roles>
+              <role key="label" text="where to place the label" requisite="optional" type="node" />
+              <role key="perimeter" text="perimeter of the site" requisite="optional" type="closedway,relation" />
+              <role key="entrance" text="entrances to the site, on the perimeter" requisite="optional" type="node" />
+              <role key="" text="members of site" requisite="optional" type="node,way,closedway,relation" />
+          </roles>
+      </item>
+      <separator/>
+      <item name="Turn restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
+                es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:restriction"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:restriction"
+                it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:restriction"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:restriction"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:restriction"
+                pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Relation:restriction"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:restriction" />
+          <space />
+          <key key="type" value="restriction" />
+          <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" values_searchable="true" />
+          <optional>
+              <text key="name" text="Name" />
+          </optional>
+          <roles>
+              <role key="from" text="from way" requisite="required" count="1" type="way" />
+              <role key="via" text="via node or ways" requisite="required" type="way,node" />
+              <role key="to" text="to way" requisite="required" count="1" type="way" />
+          </roles>
+      </item>
+      <item name="Enforcement" icon="presets/speed_camera.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
+                es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:enforcement"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:enforcement"
+                it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:enforcement"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:enforcement"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement" />
+          <space />
+          <key key="type" value="enforcement" />
+          <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check " />
+          <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
+          <text key="maxweight" text="Max. weight (tonnes, only if enforcement=maxweight)" />
+          <text key="maxspeed" text="Max. speed (km/h, only if enforcement=maxspeed)" />
+          <roles>
+              <role key="device" text="location of enforcement device" requisite="required" type="node,way,closedway" />
+              <role key="from" text="node on way where enforcement starts" requisite="required" type="node" />
+              <role key="to" text="where enforcement ends" requisite="optional" type="node" />
+              <role key="force" text="traffic light or barrier that stops you" requisite="optional" type="node" />
+          </roles>
+      </item>
+      <separator/>
+    <group name="Routes">
+        <item name="Bicycle route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
+                  sk.href="http://wiki.openstreetmap.org/wiki/Sk:Cycle_routes"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Cycle_routes" />
+            <space/>
+            <key key="type" value="route" />
+            <key key="route" value="bicycle" />
+            <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue" />
+            <reference ref="name_ref_operator" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="route_hikebike_optionals" />
             </optional>
             <roles>
-                <role key="from" text="from way" requisite="required" count="1" type="way" />
-                <role key="via" text="via node or ways" requisite="required" type="way,node" />
-                <role key="to" text="to way" requisite="required" count="1" type="way" />
+                <role key="" text="route segment" requisite="required" type="way" />
             </roles>
         </item>
-        <item name="Enforcement" icon="presets/speed_camera.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:enforcement"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:enforcement"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Relation:enforcement"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:enforcement"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:enforcement" />
-            <space />
-            <key key="type" value="enforcement" />
-            <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check " />
-            <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
-            <text key="maxweight" text="Max. weight (tonnes, only if enforcement=maxweight)" />
-            <text key="maxspeed" text="Max. speed (km/h, only if enforcement=maxspeed)" />
-            <roles>
-                <role key="device" text="location of enforcement device" requisite="required" type="node,way,closedway" />
-                <role key="from" text="node on way where enforcement starts" requisite="required" type="node" />
-                <role key="to" text="where enforcement ends" requisite="optional" type="node" />
-                <role key="force" text="traffic light or barrier that stops you" requisite="optional" type="node" />
-            </roles>
-        </item>
-        <separator/>
-        <group name="Routes">
-            <item name="Bicycle route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
-                  sk.href="http://wiki.openstreetmap.org/wiki/Sk:Cycle_routes"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Cycle_routes"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="bicycle"/>
-                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue" />
-                <reference ref="name_ref_operator"/>
-                <optional>
-                    <reference ref="route_hikebike_optionals" />
-                </optional>
-                <roles>
-                    <role key="" text="route segment" requisite="required" type="way"/>
-                </roles>
-            </item>
-            <item name="MTB route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"
+        <item name="MTB route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Mountain_biking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Mountain_biking"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Mountain_biking"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Mountain_biking"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Mountain_biking"
                   no.href="http://wiki.openstreetmap.org/wiki/No:Mountain_biking"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Mountain_biking"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="mtb"/>
-                <reference ref="name_ref_operator"/>
-                <optional>
-                    <reference ref="route_hikebike_optionals" />
-                </optional>
-                <roles>
-                    <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=track"/>
-                </roles>
-            </item>
-            <item name="Hiking route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Mountain_biking" />
+            <space />
+            <key key="type" value="route" />
+            <key key="route" value="mtb" />
+            <reference ref="name_ref_operator" />
+            <optional>
+              <reference ref="route_hikebike_optionals" />
+            </optional>
+            <roles>
+                <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=track" />
+            </roles>
+        </item>
+        <item name="Hiking route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Hiking"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Hiking"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Hiking"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Hiking"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Hiking"
-                  ro.href="http://wiki.openstreetmap.org/wiki/Ro:Hiking"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="hiking"/>
-                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue" />
-                <reference ref="name_ref_operator"/>
-                <optional>
-                    <reference ref="route_hikebike_optionals" />
-                </optional>
-                <roles>
-                    <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=footway OR highway=track"/>
-                    <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
-                    <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
-                </roles>
-            </item>
-            <item name="Piste route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:route=piste"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="piste"/>
-                <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue" />
-                <reference ref="name_ref_operator"/>
-                <optional>
-                    <reference ref="route_hikebike_optionals" />
-                </optional>
-                <roles>
-                    <role key="" text="route segment" requisite="optional" type="way" />
-                    <role key="forward" text="forward segment" requisite="optional" type="way" />
-                    <role key="backward" text="backward segment" requisite="optional" type="way" />
-                    <role key="link" text="link segment" requisite="optional" type="way" />
-                    <role key="shortcut" text="shortcut segment" requisite="optional" type="way" />
-                    <role key="variant" text="variant segment" requisite="optional" type="way" />
-                    <role key="start" text="entry points" requisite="optional" type="node" />
-                </roles>
-            </item>
-            <item name="Ski route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ski"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="piste"/>
-                <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue" />
-                <reference ref="name_ref_operator"/>
-                <optional>
-                    <reference ref="route_hikebike_optionals" />
-                </optional>
-                <roles>
-                    <role key="" text="route segment" requisite="optional" type="way" />
-                    <role key="forward" text="forward segment" requisite="optional" type="way" />
-                    <role key="backward" text="backward segment" requisite="optional" type="way" />
-                    <role key="link" text="link segment" requisite="optional" type="way" />
-                    <role key="shortcut" text="shortcut segment" requisite="optional" type="way" />
-                    <role key="variant" text="variant segment" requisite="optional" type="way" />
-                    <role key="start" text="entry points" requisite="optional" type="node" />
-                </roles>
-            </item>
-            <separator/>
-            <item name="Detour route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=detour"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="detour"/>
-                <reference ref="name_ref_operator"/>
-                <optional>
-                    <text key="destination" text="Destination"/>
-                    <text key="detour" text="Ref of the way this is a detour to"/>
-                </optional>
-                <roles>
-                    <role key="" text="route segment" requisite="required" type="way"/>
-                    <role key="fork" text="fork node for alternative routes" requisite="optional" type="node"/>
-                </roles>
-            </item>
-            <item name="Power route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="power"/>
-                <reference ref="name_ref_operator"/>
-                <roles>
-                    <role key="" text="route segment" requisite="required" type="way" member_expression="power"/>
-                </roles>
-            </item>
-            <item name="Railway route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=railway"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=railway"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="railway"/>
-                <reference ref="name_ref_operator"/>
-                <roles>
-                    <role key="" text="route segment" requisite="required" type="way" member_expression="railway"/>
-                </roles>
-            </item>
-            <item name="Road route" icon="presets/path.png" type="relation" preset_name_label="true">
-                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:route=road"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=road"/>
-                <space/>
-                <key key="type" value="route"/>
-                <key key="route" value="road"/>
-                <reference ref="name_ref"/>
-                <text key="network" text="Network" />
-                <text key="operator" text="Operator" />
-                <text key="distance" text="Distance (km)"/>
-                <roles>
-                    <role key="" text="route segment" requisite="optional" type="way" member_expression="highway"/>
-                    <role key="forward" text="forward segment" requisite="optional" type="way" member_expression="highway"/>
-                    <role key="backward" text="backward segment" requisite="optional" type="way" member_expression="highway"/>
-                    <role key="link" text="link segment" requisite="optional" type="way" member_expression="highway"/>
-                </roles>
-            </item>
-        </group> <!-- Routes -->
-        <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
+                  ro.href="http://wiki.openstreetmap.org/wiki/Ro:Hiking" />
             <space />
-            <key key="type" value="network" />
-            <text key="name" text="Name" />
+            <key key="type" value="route" />
+            <key key="route" value="hiking" />
+            <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue" />
+            <reference ref="name_ref_operator" />
             <optional>
-                <text key="network" text="Network" />
-                <text key="operator" text="Operator" />
+                <reference ref="route_hikebike_optionals" />
             </optional>
             <roles>
-                <role key="" text="member" requisite="required" type="relation" />
+                <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=footway OR highway=track" />
+                <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity" />
+                <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality" />
             </roles>
         </item>
-        <separator/>
-        <item name="Associated Street" icon="presets/addresses.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:associatedStreet"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:associatedStreet"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:associatedStreet" />
+        <item name="Piste route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:route=piste" />
             <space />
-            <key key="type" value="associatedStreet" />
-            <text key="name" text="Street name" />
+            <key key="type" value="route" />
+            <key key="route" value="piste" />
+            <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue" />
+            <reference ref="name_ref_operator" />
+            <optional>
+                <reference ref="route_hikebike_optionals" />
+            </optional>
             <roles>
-                <role key="street" text="street" requisite="required" type="way,closedway" member_expression="highway" />
-                <role key="house" text="house" requisite="required" type="node,way,closedway,relation" member_expression="&quot;addr:housenumber&quot; | &quot;addr:interpolation&quot;" />
+                <role key="" text="route segment" requisite="optional" type="way" />
+                <role key="forward" text="forward segment" requisite="optional" type="way" />
+                <role key="backward" text="backward segment" requisite="optional" type="way" />
+                <role key="link" text="link segment" requisite="optional" type="way" />
+                <role key="shortcut" text="shortcut segment" requisite="optional" type="way" />
+                <role key="variant" text="variant segment" requisite="optional" type="way" />
+                <role key="start" text="entry points" requisite="optional" type="node" />
             </roles>
         </item>
-        <item name="Street" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:street"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street" />
+        <item name="Ski route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ski" />
             <space />
-            <key key="type" value="street" />
-            <text key="name" text="Name" />
-            <roles>
-                <role key="street" text="ways being part of street" requisite="required" type="way" />
-                <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway" />
-                <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway" />
-                <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
-            </roles>
-        </item>
-        <item name="Destination sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:destination_sign"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:destination_sign"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:destination_sign"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:destination_sign"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign" />
-            <space />
-            <key key="type" value="destination_sign" />
-            <text key="destination" text="Destination written on sign (w/o distance)" />
-            <text key="distance" text="Distance (km)" />
-            <text key="time" text="Time (hh:mm, for trekking)" />
-            <text key="colour:back" text="Colour of background" />
-            <text key="colour:text" text="Colour of text" />
-            <text key="colour:arrow" text="Colour of border/arrow" />
+            <key key="type" value="route" />
+            <key key="route" value="piste" />
+            <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue" />
+            <reference ref="name_ref_operator" />
+            <optional>
+                <reference ref="route_hikebike_optionals" />
+            </optional>
             <roles>
-                <role key="from" text="last way before junction" requisite="optional" type="node,way" />
-                <role key="intersection" text="node of the intersection" requisite="optional" count="1" type="node" />
-                <role key="to" text="first way after junction" requisite="required" count="1" type="node,way" />
-                <role key="sign" text="position of sign" requisite="optional" type="node" />
+                <role key="" text="route segment" requisite="optional" type="way" />
+                <role key="forward" text="forward segment" requisite="optional" type="way" />
+                <role key="backward" text="backward segment" requisite="optional" type="way" />
+                <role key="link" text="link segment" requisite="optional" type="way" />
+                <role key="shortcut" text="shortcut segment" requisite="optional" type="way" />
+                <role key="variant" text="variant segment" requisite="optional" type="way" />
+                <role key="start" text="entry points" requisite="optional" type="node" />
             </roles>
         </item>
         <separator/>
-        <item name="Waterway" icon="presets/river.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway" />
+        <item name="Detour route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=detour" />
             <space />
-            <key key="type" value="waterway" />
-            <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" values_searchable="true" />
-            <text key="name" text="Name" />
+            <key key="type" value="route" />
+            <key key="route" value="detour" />
+            <reference ref="name_ref_operator" />
             <optional>
-                <text key="destination" text="Name of river/sea/ocean" />
-                <text key="ref" text="Reference" />
-                <text key="ref:sandre" text="Reference Sandre (FR)" />
-                <text key="ref:fgkz" text="Reference FGKZ (DE)" />
-                <text key="ref:regine" text="Reference REGINE (NO)" />
-                <text key="ref:gnis" text="Reference GNIS (USA)" />
-                <text key="ref:gnbc" text="Reference GNBC (CA)" />
-                <text key="wikipedia" text="Wikipedia" />
+                <text key="destination" text="Destination" />
+                <text key="detour" text="Ref of the way this is a detour to" />
             </optional>
             <roles>
-                <role key="" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
-                <role key="main_stream" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
-                <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
-                <role key="spring" text="spring of waterway" requisite="optional" type="node" />
+                <role key="" text="route segment" requisite="required" type="way" />
+                <role key="fork" text="fork node for alternative routes" requisite="optional" type="node" />
             </roles>
         </item>
-        <item name="Bridge" icon="presets/bridge.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relations/Proposed/Bridges_and_Tunnels"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Relations/Proposed/Bridges_and_Tunnels"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels" />
+        <item name="Power route" icon="presets/path.png" type="relation" preset_name_label="true">
             <space />
-            <key key="type" value="bridge" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <reference ref="name_ref" />
-            <text key="height" text="Height (meters)" />
-            <text key="length" text="Length (meters)" />
-            <text key="operator" text="Operator" />
+            <key key="type" value="route" />
+            <key key="route" value="power" />
+            <reference ref="name_ref_operator" />
             <roles>
-                <role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
-                <role key="under" text="ways passing under the bridge" requisite="optional" type="way" />
-                <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
-                <role key="edge" text="edge ways parallel to 'across'" requisite="optional" type="way" />
+                <role key="" text="route segment" requisite="required" type="way" member_expression="power" />
             </roles>
         </item>
-        <item name="Tunnel" icon="presets/tunnel.png" type="relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
+        <item name="Railway route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=railway"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=railway" />
             <space />
-            <key key="type" value="tunnel" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <reference ref="name_ref" />
-            <text key="length" text="Length (meters)" />
-            <text key="operator" text="Operator" />
+            <key key="type" value="route" />
+            <key key="route" value="railway" />
+            <reference ref="name_ref_operator" />
             <roles>
-                <role key="through" text="ways passing through the tunnel" requisite="required" type="way" />
-                <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
-                <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
+                <role key="" text="route segment" requisite="required" type="way" member_expression="railway" />
             </roles>
         </item>
-    </group> <!-- Relations -->
+        <item name="Road route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:route=road"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=road" />
+              <space />
+              <key key="type" value="route" />
+              <key key="route" value="road" />
+              <reference ref="name_ref" />
+              <text key="network" text="Network" />
+              <text key="operator" text="Operator" />
+              <text key="distance" text="Distance (km)" />
+              <roles>
+                  <role key="" text="route segment" requisite="optional" type="way" member_expression="highway" />
+                  <role key="forward" text="forward segment" requisite="optional" type="way" member_expression="highway" />
+                  <role key="backward" text="backward segment" requisite="optional" type="way" member_expression="highway" />
+                  <role key="link" text="link segment" requisite="optional" type="way" member_expression="highway" />
+              </roles>
+          </item>
+      </group> <!-- Routes -->
+      <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
+          <space />
+          <key key="type" value="network" />
+          <text key="name" text="Name" />
+          <optional>
+              <text key="network" text="Network" />
+              <text key="operator" text="Operator" />
+          </optional>
+          <roles>
+              <role key="" text="member" requisite="required" type="relation" />
+          </roles>
+      </item>
+      <separator/>
+      <item name="Associated Street" icon="presets/addresses.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:associatedStreet"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:associatedStreet"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:associatedStreet"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:associatedStreet"
+                uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:associatedStreet" />
+          <space />
+          <key key="type" value="associatedStreet" />
+          <text key="name" text="Street name" />
+          <roles>
+              <role key="street" text="street" requisite="required" type="way,closedway" member_expression="highway" />
+              <role key="house" text="house" requisite="required" type="node,way,closedway,relation" member_expression="&quot;addr:housenumber&quot; | &quot;addr:interpolation&quot;" />
+          </roles>
+      </item>
+      <item name="Street" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:street"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street" />
+          <space />
+          <key key="type" value="street" />
+          <text key="name" text="Name" />
+          <roles>
+              <role key="street" text="ways being part of street" requisite="required" type="way" />
+              <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway" />
+              <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway" />
+              <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
+          </roles>
+      </item>
+      <item name="Destination sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
+                es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:destination_sign"
+                fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:destination_sign"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:destination_sign"
+                pl.href="http://wiki.openstreetmap.org/wiki/Pl:Relation:destination_sign"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:destination_sign" />
+          <space />
+          <key key="type" value="destination_sign" />
+          <text key="destination" text="Destination written on sign (w/o distance)" />
+          <text key="distance" text="Distance (km)" />
+          <text key="time" text="Time (hh:mm, for trekking)" />
+          <text key="colour:back" text="Colour of background" />
+          <text key="colour:text" text="Colour of text" />
+          <text key="colour:arrow" text="Colour of border/arrow" />
+          <roles>
+              <role key="from" text="last way before junction" requisite="optional" type="node,way" />
+              <role key="intersection" text="node of the intersection" requisite="optional" count="1" type="node" />
+              <role key="to" text="first way after junction" requisite="required" count="1" type="node,way" />
+              <role key="sign" text="position of sign" requisite="optional" type="node" />
+          </roles>
+      </item>
+      <separator/>
+      <item name="Waterway" icon="presets/river.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway" />
+          <space />
+          <key key="type" value="waterway" />
+          <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" values_searchable="true" />
+          <text key="name" text="Name" />
+          <optional>
+              <text key="destination" text="Name of river/sea/ocean" />
+              <text key="ref" text="Reference" />
+              <text key="ref:sandre" text="Reference Sandre (FR)" />
+              <text key="ref:fgkz" text="Reference FGKZ (DE)" />
+              <text key="ref:regine" text="Reference REGINE (NO)" />
+              <text key="ref:gnis" text="Reference GNIS (USA)" />
+              <text key="ref:gnbc" text="Reference GNBC (CA)" />
+              <text key="wikipedia" text="Wikipedia" />
+          </optional>
+          <roles>
+              <role key="" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
+              <role key="main_stream" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
+              <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
+              <role key="spring" text="spring of waterway" requisite="optional" type="node" />
+          </roles>
+      </item>
+      <item name="Bridge" icon="presets/bridge.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Relations/Proposed/Bridges_and_Tunnels"
+                ja.href="http://wiki.openstreetmap.org/wiki/JA:Relations/Proposed/Bridges_and_Tunnels"
+                ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels" />
+          <space />
+          <key key="type" value="bridge" />
+          <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+          <reference ref="name_ref" />
+          <text key="height" text="Height (meters)" />
+          <text key="length" text="Length (meters)" />
+          <text key="operator" text="Operator" />
+          <roles>
+              <role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
+              <role key="under" text="ways passing under the bridge" requisite="optional" type="way" />
+              <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
+              <role key="edge" text="edge ways parallel to 'across'" requisite="optional" type="way" />
+          </roles>
+      </item>
+      <item name="Tunnel" icon="presets/tunnel.png" type="relation" preset_name_label="true">
+          <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
+          <space />
+          <key key="type" value="tunnel" />
+          <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+          <reference ref="name_ref" />
+          <text key="length" text="Length (meters)" />
+          <text key="operator" text="Operator" />
+          <roles>
+              <role key="through" text="ways passing through the tunnel" requisite="required" type="way" />
+              <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
+              <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
+          </roles>
+      </item>
+  </group> <!-- Relations -->
 </presets>