Ticket #9327: 9327v3.patch

File 9327v3.patch, 249.8 KB (added by simon04, 12 years ago)

  • data/defaultpresets.xml 

    diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 428d424..4fcaac1 100755
    a b text: text box  
    4545  text: fixed label to display
    4646  default: default string to display (defaults to "")
    4747  use_last_as_default: true/false/force (default is "false")
    48   auto_increment: may contain a comma separated list of integer increments or 
     48  auto_increment: may contain a comma separated list of integer increments or
    4949                  decrements, e.g. "-2,-1,+1,+2"; a button will be shown next
    5050                  to the text field for each value, allowing the user to select
    5151                  auto-increment with the given stepping. auto-increment only
    … … combo: combo box, with multiple choices and possible to enter free form text  
    5959  text: fixed label to display
    6060  delimiter: character that separates values (default: comma)
    6161  values: separated list of values
    62   values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
     62  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
    6363               of this form: public static String[] getValues();
    6464               The value must be: "full.package.name.ClassName#methodName"
    6565  display_values: comma separated list of values to be displayed instead of the
    … … multiselect: list of values from which zero or more can be selected  
    8484  delimiter: character that separates values (default: semicolon) - this
    8585             will also be used to separate selected values in the tag.
    8686  values: delimiter-separated list of values (delimiter can be escaped with backslash)
    87   values_from: to use instead of "values" if the list of values has to be obtained with a Java method 
     87  values_from: to use instead of "values" if the list of values has to be obtained with a Java method
    8888               of this form: public static String[] getValues();
    8989               The value must be: "full.package.name.ClassName#methodName"
    9090  rows: specify the number of rows to display (default -1)
    … … checkgroup: group of checks  
    108108check: checkbox
    109109  key: key to set
    110110  text: fixed label to display
    111   default: ticked on/off
     111  default: ticked on/off (default is "off")
    112112  value_on: the value to set when checked (default is "yes")
    113113  value_off: the value to set when unchecked (default is "no")
    114114  match: none/key/key!/keyvalue (default is "none", see below for more information)
    … … the tags of an OSM object fit into this preset.  
    148148 - keyvalue: positive if key and value matches, negative otherwise
    149149Note that for a match, at least one positive and no negative is required.
    150150-->
     151    <chunk id="surface">
     152        <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     153    </chunk>
     154    <chunk id="highway_base">
     155        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3"/>
     156        <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
     157        <text key="maxspeed" text="Max. speed (km/h)"/>
     158        <reference ref="surface" />
     159    </chunk>
     160    <chunk id="highway_yesno_incline">
     161        <check key="bridge" text="Bridge" />
     162        <check key="tunnel" text="Tunnel" />
     163        <check key="cutting" text="Cutting" />
     164        <check key="embankment" text="Embankment" />
     165        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
     166    </chunk>
     167    <chunk id="highway_yesno_incline_oneway">
     168        <check key="oneway" text="Oneway" />
     169        <reference ref="highway_yesno_incline" />
     170    </chunk>
     171    <chunk id="highway_yesno_incline_oneway_lit">
     172        <reference ref="highway_yesno_incline_oneway" />
     173        <check key="lit" text="Lit" />
     174    </chunk>
     175    <chunk id="highway_yesno_incline_oneway_lit_width">
     176        <reference ref="highway_yesno_incline_oneway_lit" />
     177        <check key="lit" text="Lit" />
     178    </chunk>
     179    <chunk id="barrier_5">
     180        <optional text="Allowed traffic:">
     181            <check key="foot" text="Foot" default="on"/>
     182            <check key="bicycle" text="Bicycle" default="on"/>
     183            <check key="horse" text="Horse" />
     184            <check key="motorcycle" text="Motorcycle" />
     185            <check key="motorcar" text="Motorcar" />
     186        </optional>
     187    </chunk>
     188    <chunk id="barrier_4">
     189        <optional text="Allowed traffic:">
     190            <check key="foot" text="Foot" default="on"/>
     191            <check key="bicycle" text="Bicycle" default="on"/>
     192            <check key="horse" text="Horse" />
     193            <check key="motorcycle" text="Motorcycle" />
     194        </optional>
     195    </chunk>
     196    <chunk id="barrier_2">
     197        <optional text="Allowed traffic:">
     198            <check key="foot" text="Foot" default="on"/>
     199            <check key="bicycle" text="Bicycle" default="on"/>
     200        </optional>
     201    </chunk>
     202    <chunk id="contact">
     203        <text key="phone" text="Phone Number"/>
     204        <text key="fax" text="Fax Number"/>
     205        <text key="website" text="Website"/>
     206    <text key="email" text="Email Address"/>
     207    </chunk>
     208    <chunk id="name_ref">
     209        <text key="name" text="Name" />
     210        <text key="ref" text="Reference" />
     211    </chunk>
     212    <chunk id="name_operator">
     213        <text key="name" text="Name" />
     214        <text key="operator" text="Operator" />
     215    </chunk>
     216    <chunk id="name_layer">
     217        <text key="name" text="Name" />
     218        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     219    </chunk>
     220    <chunk id="oh">
     221        <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" />
     222    </chunk>
     223    <chunk id="name_oh">
     224        <text key="name" text="Name" />
     225        <reference ref="oh" />
     226    </chunk>
     227    <chunk id="name_operator_oh">
     228        <text key="name" text="Name" />
     229        <text key="operator" text="Operator" />
     230        <reference ref="oh" />
     231    </chunk>
     232    <chunk id="name_brand_operator_oh">
     233        <text key="name" text="Name" />
     234        <text key="brand" text="Brand" />
     235        <text key="operator" text="Operator" />
     236        <reference ref="oh" />
     237    </chunk>
     238    <chunk id="name_brand_oh">
     239        <text key="name" text="Name" />
     240        <text key="brand" text="Brand" />
     241        <reference ref="oh" />
     242    </chunk>
     243    <chunk id="internet_smoking_wheelchair">
     244        <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
     245        <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
     246        <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
     247        <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     248    </chunk>
     249    <chunk id="optional_height">
     250        <optional>
     251            <text key="height" text="Height (meters)" length="7" />
     252        </optional>
     253    </chunk>
     254    <chunk id="optional_maxwidth">
     255        <optional>
     256            <text key="maxwidth" text="Max. width (meters)" length="7" />
     257        </optional>
     258    </chunk>
     259    <chunk id="name_leisure_pitch">
     260        <text key="name" text="Name" />
     261        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     262    </chunk>
    151263  <group name="Highways" icon="presets/way_secondary.png">
    152264    <group name="Streets" icon="presets/way_secondary.png">
    153265        <item name="Motorway" icon="presets/motorway.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    167279            <text key="ref" text="Reference" />
    168280            <optional>
    169281                <text key="name" text="Name" />
    170                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    171                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    172                 <text key="maxspeed" text="Max. speed (km/h)" />
    173                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     282                <reference ref="highway_base" />
    174283                <checkgroup columns="4">
    175284                    <check key="oneway" text="Oneway" default="on" />
    176                     <check key="bridge" text="Bridge" default="off" />
    177                     <check key="tunnel" text="Tunnel" default="off" />
    178                     <check key="cutting" text="Cutting" default="off" />
    179                     <check key="embankment" text="Embankment" default="off" />
    180                     <check key="lit" text="Lit" default="off" />
    181                     <check key="toll" text="Toll" default="off"  />
     285                    <check key="bridge" text="Bridge" />
     286                    <check key="tunnel" text="Tunnel" />
     287                    <check key="cutting" text="Cutting" />
     288                    <check key="embankment" text="Embankment" />
     289                    <check key="lit" text="Lit" />
     290                    <check key="toll" text="Toll" />
    182291                </checkgroup>
    183292            </optional>
    184293        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    195304            <label text="Edit Motorway Link" />
    196305            <key key="highway" value="motorway_link" />
    197306            <optional>
    198                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    199                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    200                 <text key="maxspeed" text="Max. speed (km/h)" />
    201                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     307                <reference ref="highway_base" />
    202308                <checkgroup columns="4">
    203309                    <check key="oneway" text="Oneway" default="on" />
    204310                    <check key="bridge" text="Bridge" />
    … … Note that for a match, at least one positive and no negative is required.  
    226332            <text key="ref" text="Reference" />
    227333            <optional>
    228334                <text key="name" text="Name" />
    229                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    230                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    231                 <text key="maxspeed" text="Max. speed (km/h)" />
    232                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     335                <reference ref="highway_base" />
    233336                <checkgroup columns="4">
    234337                    <check key="oneway" text="Oneway" default="on" />
    235338                    <check key="motorroad" text="Motorroad" default="on" />
    … … Note that for a match, at least one positive and no negative is required.  
    255358            <key key="highway" value="trunk_link" />
    256359            <text key="ref" text="Reference" />
    257360            <optional>
    258                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    259                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    260                 <text key="maxspeed" text="Max. speed (km/h)" />
    261                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     361                <reference ref="highway_base" />
    262362                <checkgroup columns="4">
    263363                    <check key="oneway" text="Oneway" default="on" />
    264364                    <check key="motorroad" text="Motorroad" default="on" />
    … … Note that for a match, at least one positive and no negative is required.  
    268368                    <check key="embankment" text="Embankment" />
    269369                    <check key="lit" text="Lit" />
    270370                    <check key="toll" text="Toll" />
    271                 </checkgroup> 
     371                </checkgroup>
    272372            </optional>
    273373        </item>
    274374        <separator/>
    … … Note that for a match, at least one positive and no negative is required.  
    288388            <text key="ref" text="Reference" />
    289389            <optional>
    290390                <text key="name" text="Name" />
    291                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    292                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    293                 <text key="maxspeed" text="Max. speed (km/h)" />
    294                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    295                 <check key="oneway" text="Oneway" default="off" />
    296                 <check key="motorroad" text="Motorroad" default="off" />
    297                 <check key="bridge" text="Bridge" default="off" />
    298                 <check key="tunnel" text="Tunnel" default="off" />
    299                 <check key="cutting" text="Cutting" default="off" />
    300                 <check key="embankment" text="Embankment" default="off" />
    301                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    302                 <check key="lit" text="Lit" default="off" />
     391                <reference ref="highway_base" />
     392                <check key="oneway" text="Oneway" />
     393                <check key="motorroad" text="Motorroad" />
     394                <reference ref="highway_yesno_incline" />
     395                <check key="lit" text="Lit" />
    303396            </optional>
    304397        </item>
    305398        <item name="Primary Link" icon="presets/way_primary.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    313406            <label text="Edit Primary Link" />
    314407            <key key="highway" value="primary_link" />
    315408            <optional>
    316                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    317                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    318                 <text key="maxspeed" text="Max. speed (km/h)" />
    319                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    320                 <check key="oneway" text="Oneway" default="off" />
    321                 <check key="motorroad" text="Motorroad" default="off" />
    322                 <check key="bridge" text="Bridge" default="off" />
    323                 <check key="tunnel" text="Tunnel" default="off" />
    324                 <check key="cutting" text="Cutting" default="off" />
    325                 <check key="embankment" text="Embankment" default="off" />
    326                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    327                 <check key="lit" text="Lit" default="off" />
     409                <reference ref="highway_base" />
     410                <check key="oneway" text="Oneway" />
     411                <check key="motorroad" text="Motorroad" />
     412                <reference ref="highway_yesno_incline" />
     413                <check key="lit" text="Lit" />
    328414            </optional>
    329415        </item>
    330416        <item name="Secondary" icon="presets/way_secondary.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    344430            <text key="ref" text="Reference" />
    345431            <optional>
    346432                <text key="name" text="Name" />
    347                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    348                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    349                 <text key="maxspeed" text="Max. speed (km/h)" />
    350                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    351                 <check key="oneway" text="Oneway" default="off" />
    352                 <check key="bridge" text="Bridge" default="off" />
    353                 <check key="tunnel" text="Tunnel" default="off" />
    354                 <check key="cutting" text="Cutting" default="off" />
    355                 <check key="embankment" text="Embankment" default="off" />
    356                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    357                 <check key="lit" text="Lit" default="off" />
     433                <reference ref="highway_base" />
     434                <reference ref="highway_yesno_incline_oneway_lit" />
    358435            </optional>
    359436        </item>
    360437        <item name="Secondary Link" icon="presets/way_secondary.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    368445            <label text="Edit Secondary Link" />
    369446            <key key="highway" value="secondary_link" />
    370447            <optional>
    371                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    372                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    373                 <text key="maxspeed" text="Max. speed (km/h)" />
    374                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    375                 <check key="oneway" text="Oneway" default="off" />
    376                 <check key="bridge" text="Bridge" default="off" />
    377                 <check key="tunnel" text="Tunnel" default="off" />
    378                 <check key="cutting" text="Cutting" default="off" />
    379                 <check key="embankment" text="Embankment" default="off" />
    380                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    381                 <check key="lit" text="Lit" default="off" />
     448                <reference ref="highway_base" />
     449                <reference ref="highway_yesno_incline_oneway_lit" />
    382450            </optional>
    383451        </item>
    384452        <item name="Tertiary" icon="presets/way_tertiary.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    399467            <text key="ref" text="Reference" />
    400468            <optional>
    401469                <text key="name" text="Name" />
    402                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    403                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    404                 <text key="maxspeed" text="Max. speed (km/h)" />
    405                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    406                 <check key="oneway" text="Oneway" default="off" />
    407                 <check key="bridge" text="Bridge" default="off" />
    408                 <check key="tunnel" text="Tunnel" default="off" />
    409                 <check key="cutting" text="Cutting" default="off" />
    410                 <check key="embankment" text="Embankment" default="off" />
    411                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    412                 <check key="lit" text="Lit" default="off" />
     470                <reference ref="highway_base" />
     471                <reference ref="highway_yesno_incline_oneway_lit" />
    413472            </optional>
    414473        </item>
    415474        <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    423482            <label text="Edit Tertiary Link" />
    424483            <key key="highway" value="tertiary_link" />
    425484            <optional>
    426                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    427                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    428                 <text key="maxspeed" text="Max. speed (km/h)" />
    429                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    430                 <check key="oneway" text="Oneway" default="off" />
    431                 <check key="bridge" text="Bridge" default="off" />
    432                 <check key="tunnel" text="Tunnel" default="off" />
    433                 <check key="cutting" text="Cutting" default="off" />
    434                 <check key="embankment" text="Embankment" default="off" />
    435                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    436                 <check key="lit" text="Lit" default="off" />
     485                <reference ref="highway_base" />
     486                <reference ref="highway_yesno_incline_oneway_lit" />
    437487            </optional>
    438488        </item>
    439489        <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    451501            <optional>
    452502                <text key="name" text="Name" />
    453503                <text key="ref" text="Reference" />
    454                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    455                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    456                 <text key="maxspeed" text="Max. speed (km/h)" />
    457                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    458                 <check key="oneway" text="Oneway" default="off" />
    459                 <check key="bridge" text="Bridge" default="off" />
    460                 <check key="tunnel" text="Tunnel" default="off" />
    461                 <check key="cutting" text="Cutting" default="off" />
    462                 <check key="embankment" text="Embankment" default="off" />
    463                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    464                 <check key="lit" text="Lit" default="off" />
    465                 <check key="passing_places" text="Passing Places" default="off" />
     504                <reference ref="highway_base" />
     505                <reference ref="highway_yesno_incline_oneway_lit" />
     506                <check key="passing_places" text="Passing Places" />
    466507                <text key="width" text="Width (meters)" />
    467508            </optional>
    468509        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    482523            <text key="name" text="Name" />
    483524            <optional>
    484525                <text key="ref" text="Reference" />
    485                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    486                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    487                 <text key="maxspeed" text="Max. speed (km/h)" />
    488                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    489                 <check key="oneway" text="Oneway" default="off" />
    490                 <check key="bridge" text="Bridge" default="off" />
    491                 <check key="tunnel" text="Tunnel" default="off" />
    492                 <check key="cutting" text="Cutting" default="off" />
    493                 <check key="embankment" text="Embankment" default="off" />
    494                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    495                 <check key="lit" text="Lit" default="off" />
     526                <reference ref="highway_base" />
     527                <reference ref="highway_yesno_incline_oneway_lit" />
    496528                <text key="width" text="Width (meters)" />
    497529            </optional>
    498530        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    511543            <optional>
    512544                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" />
    513545                <combo key="lanes" text="Lanes" values="1,2,3,4,5" />
    514                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    515                 <check key="oneway" text="Oneway" default="off" />
    516                 <check key="oneway:bicycle" text="Oneway for bicycle" default="off" />
    517                 <check key="bridge" text="Bridge" default="off" />
    518                 <check key="tunnel" text="Tunnel" default="off" />
    519                 <check key="cutting" text="Cutting" default="off" />
    520                 <check key="embankment" text="Embankment" default="off" />
    521                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    522                 <check key="lit" text="Lit" default="off" />
     546                <reference ref="surface" />
     547                <check key="oneway" text="Oneway" />
     548                <check key="oneway:bicycle" text="Oneway for bicycle" />
     549                <reference ref="highway_yesno_incline" />
     550                <check key="lit" text="Lit" />
    523551                <text key="width" text="Width (meters)" />
    524552            </optional>
    525553        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    539567            <optional>
    540568                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    541569                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    542                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    543                 <check key="oneway" text="Oneway" default="off" />
    544                 <check key="bridge" text="Bridge" default="off" />
    545                 <check key="tunnel" text="Tunnel" default="off" />
    546                 <check key="cutting" text="Cutting" default="off" />
    547                 <check key="embankment" text="Embankment" default="off" />
    548                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    549                 <check key="lit" text="Lit" default="off" />
     570                <reference ref="surface" />
     571                <reference ref="highway_yesno_incline_oneway_lit" />
    550572                <text key="width" text="Width (meters)" />
    551573            </optional>
    552574        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    568590            <optional>
    569591                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    570592                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    571                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    572                 <check key="area" text="Area" default="off" />
    573                 <check key="bridge" text="Bridge" default="off" />
    574                 <check key="tunnel" text="Tunnel" default="off" />
    575                 <check key="cutting" text="Cutting" default="off" />
    576                 <check key="embankment" text="Embankment" default="off" />
    577                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    578                 <check key="lit" text="Lit" default="off" />
     593                <reference ref="surface" />
     594                <check key="area" text="Area" />
     595                <reference ref="highway_yesno_incline" />
     596                <check key="lit" text="Lit" />
    579597                <text key="width" text="Width (meters)" />
    580598            </optional>
    581599        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    594612            <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
    595613            <optional>
    596614                <text key="name" text="Name" />
    597                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    598                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    599                 <text key="maxspeed" text="Max. speed (km/h)" />
    600                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    601                 <check key="oneway" text="Oneway" default="off" />
    602                 <check key="bridge" text="Bridge" default="off" />
    603                 <check key="tunnel" text="Tunnel" default="off" />
    604                 <check key="cutting" text="Cutting" default="off" />
    605                 <check key="embankment" text="Embankment" default="off" />
    606                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    607                 <check key="lit" text="Lit" default="off" />
    608                 <check key="passing_places" text="Passing Places" default="off" />
     615                <reference ref="highway_base" />
     616                <reference ref="highway_yesno_incline_oneway_lit" />
     617                <check key="passing_places" text="Passing Places" />
    609618                <text key="width" text="Width (meters)" />
    610619            </optional>
    611620        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    622631            <key key="highway" value="service" />
    623632            <key key="service" value="parking_aisle" />
    624633            <optional>
    625                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    626                 <check key="oneway" text="Oneway" default="off" />
    627                 <check key="lit" text="Lit" default="off" />
     634                <reference ref="surface" />
     635                <check key="oneway" text="Oneway" />
     636                <check key="lit" text="Lit" />
    628637            </optional>
    629638        </item>
    630639        <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    640649            <key key="highway" value="road" />
    641650            <optional>
    642651                <text key="name" text="Name" />
    643                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    644                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    645                 <text key="maxspeed" text="Max. speed (km/h)" />
    646                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    647                 <check key="oneway" text="Oneway" default="off" />
    648                 <check key="bridge" text="Bridge" default="off" />
    649                 <check key="tunnel" text="Tunnel" default="off" />
    650                 <check key="cutting" text="Cutting" default="off" />
    651                 <check key="embankment" text="Embankment" default="off" />
    652                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    653                 <check key="lit" text="Lit" default="off" />
    654                 <text key="width" text="Width (meters)" />
     652                <reference ref="highway_base" />
     653                <reference ref="highway_yesno_incline_oneway_lit_width" />
    655654            </optional>
    656655        </item>
    657656        <item name="Construction" icon="presets/construction.png" type="way,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    666665            <key key="highway" value="construction" />
    667666            <optional>
    668667                <text key="name" text="Name" />
    669                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    670                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    671                 <text key="maxspeed" text="Max. speed (km/h)" />
    672                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    673                 <check key="oneway" text="Oneway" default="off" />
    674                 <check key="bridge" text="Bridge" default="off" />
    675                 <check key="tunnel" text="Tunnel" default="off" />
    676                 <check key="cutting" text="Cutting" default="off" />
    677                 <check key="embankment" text="Embankment" default="off" />
    678                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    679                 <check key="lit" text="Lit" default="off" />
     668                <reference ref="highway_base" />
     669                <reference ref="highway_yesno_incline_oneway_lit" />
    680670                <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
    681671                <text key="width" text="Width (meters)" />
    682672            </optional>
    … … Note that for a match, at least one positive and no negative is required.  
    696686                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:access" />
    697687            <label text="Edit Road Restrictions" />
    698688            <space />
    699             <check key="oneway" text="Oneway" default="off" />
    700             <check key="toll" text="Toll" default="off"  />
    701             <check key="noexit" text="No exit (cul-de-sac)" default="off"  />
     689            <check key="oneway" text="Oneway" />
     690            <check key="toll" text="Toll" />
     691            <check key="noexit" text="No exit (cul-de-sac)" />
    702692            <label text="Transport mode restrictions" />
    703693            <space />
    704694            <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" match="key" values_searchable="true" />
    … … Note that for a match, at least one positive and no negative is required.  
    746736            <key key="junction" value="roundabout" />
    747737            <combo key="highway" text="Type" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
    748738            <optional>
    749                 <text key="name" text="Name" />
    750                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     739                <reference ref="name_layer" />
    751740                <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
    752                 <check key="oneway" text="Oneway" default="off" />
    753                 <check key="bridge" text="Bridge" default="off" />
    754                 <check key="tunnel" text="Tunnel" default="off" />
    755                 <check key="cutting" text="Cutting" default="off" />
    756                 <check key="embankment" text="Embankment" default="off" />
    757                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
     741                <reference ref="highway_yesno_incline_oneway" />
    758742                <text key="width" text="Width (meters)" />
    759743            </optional>
    760744        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    815799            <combo key="tracktype" text="Tracktype" values="grade1,grade2,grade3,grade4,grade5" />
    816800            <key key="highway" value="track" />
    817801            <optional>
    818                 <text key="name" text="Name" />
    819                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     802                <reference ref="name_layer" />
    820803                <combo key="surface" text="Surface" values="paved,concrete,cobblestone,gravel,ground,grass,sand" />
    821                 <check key="oneway" text="Oneway" default="off" />
    822                 <check key="bridge" text="Bridge" default="off" />
    823                 <check key="tunnel" text="Tunnel" default="off" />
    824                 <check key="cutting" text="Cutting" default="off" />
    825                 <check key="embankment" text="Embankment" default="off" />
    826                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    827                 <check key="lit" text="Lit" default="off" />
     804                <reference ref="highway_yesno_incline_oneway_lit" />
    828805                <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
    829806                <combo key="access" text="General access" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    830807                <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
    … … Note that for a match, at least one positive and no negative is required.  
    847824            <label text="Edit Path" />
    848825            <key key="highway" value="path" />
    849826            <optional>
    850                 <text key="name" text="Name" />
    851                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    852                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    853                 <check key="oneway" text="Oneway" default="off" />
    854                 <check key="bridge" text="Bridge" default="off" />
    855                 <check key="tunnel" text="Tunnel" default="off" />
    856                 <check key="cutting" text="Cutting" default="off" />
    857                 <check key="embankment" text="Embankment" default="off" />
    858                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    859                 <check key="lit" text="Lit" default="off" />
     827                <reference ref="name_layer" />
     828                <reference ref="surface" />
     829                <reference ref="highway_yesno_incline_oneway_lit" />
    860830                <combo key="sac_scale" text="SAC Scale" values_searchable="true">
    861831                    <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
    862832                    <list_entry value="mountain_hiking" display_value="T2 - mountain hiking trail" short_description="Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible" />
    … … Note that for a match, at least one positive and no negative is required.  
    888858            <label text="Edit Bridleway" />
    889859            <key key="highway" value="bridleway" />
    890860            <optional>
    891                 <text key="name" text="Name" />
    892                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     861                <reference ref="name_layer" />
    893862                <text key="maxspeed" text="Max. speed (km/h)" />
    894                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    895                 <check key="oneway" text="Oneway" default="off" />
    896                 <check key="bridge" text="Bridge" default="off" />
    897                 <check key="tunnel" text="Tunnel" default="off" />
    898                 <check key="cutting" text="Cutting" default="off" />
    899                 <check key="embankment" text="Embankment" default="off" />
    900                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    901                 <check key="lit" text="Lit" default="off" />
     863                <reference ref="surface" />
     864                <reference ref="highway_yesno_incline_oneway_lit" />
    902865                <text key="width" text="Width (meters)" />
    903866            </optional>
    904867        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    918881            <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
    919882            <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
    920883            <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
    921             <check key="oneway:bicycle" text="Oneway (bicycle)" default="off" />
     884            <check key="oneway:bicycle" text="Oneway (bicycle)" />
    922885            <space />
    923886            <optional text="Edit Highway Attributes:">
    924887                <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
    925                 <check key="oneway" text="Oneway" default="off" />
     888                <check key="oneway" text="Oneway" />
    926889            </optional>
    927890        </item>
    928891        <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    937900            <label text="Edit Cycleway" />
    938901            <key key="highway" value="cycleway" />
    939902            <optional>
    940                 <text key="name" text="Name" />
    941                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    942                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    943                 <check key="oneway" text="Oneway" default="off" />
    944                 <check key="bridge" text="Bridge" default="off" />
    945                 <check key="tunnel" text="Tunnel" default="off" />
    946                 <check key="cutting" text="Cutting" default="off" />
    947                 <check key="embankment" text="Embankment" default="off" />
    948                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    949                 <check key="lit" text="Lit" default="off" />
     903                <reference ref="name_layer" />
     904                <reference ref="surface" />
     905                <reference ref="highway_yesno_incline_oneway_lit" />
    950906                <combo key="foot" text="Pedestrians" values="unknown,yes,no" />
    951907                <text key="width" text="Width (meters)" />
    952908            </optional>
    … … Note that for a match, at least one positive and no negative is required.  
    961917            <key key="foot" value="designated" />
    962918            <key key="segregated" value="yes" />
    963919            <optional>
    964                 <text key="name" text="Name" />
    965                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    966                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    967                 <check key="oneway" text="Oneway" default="off" />
    968                 <check key="bridge" text="Bridge" default="off" />
    969                 <check key="tunnel" text="Tunnel" default="off" />
    970                 <check key="cutting" text="Cutting" default="off" />
    971                 <check key="embankment" text="Embankment" default="off" />
    972                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    973                 <check key="lit" text="Lit" default="off" />
     920                <reference ref="name_layer" />
     921                <reference ref="surface" />
     922                <reference ref="highway_yesno_incline_oneway_lit" />
    974923                <text key="width" text="Width (meters)" />
    975924            </optional>
    976925        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    984933            <key key="foot" value="designated" />
    985934            <key key="segregated" value="no" />
    986935            <optional>
    987                 <text key="name" text="Name" />
    988                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    989                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    990                 <check key="oneway" text="Oneway" default="off" />
    991                 <check key="bridge" text="Bridge" default="off" />
    992                 <check key="tunnel" text="Tunnel" default="off" />
    993                 <check key="cutting" text="Cutting" default="off" />
    994                 <check key="embankment" text="Embankment" default="off" />
    995                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    996                 <check key="lit" text="Lit" default="off" />
    997                 <check key="passing_places" text="Passing Places" default="off" />
     936                <reference ref="name_layer" />
     937                <reference ref="surface" />
     938                <reference ref="highway_yesno_incline_oneway_lit" />
     939                <check key="passing_places" text="Passing Places" />
    998940                <text key="width" text="Width (meters)" />
    999941            </optional>
    1000942        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    1012954            <label text="Edit Footway" />
    1013955            <key key="highway" value="footway" />
    1014956            <optional>
    1015                 <text key="name" text="Name" />
    1016                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1017                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
    1018                 <check key="bridge" text="Bridge" default="off" />
    1019                 <check key="tunnel" text="Tunnel" default="off" />
    1020                 <check key="cutting" text="Cutting" default="off" />
    1021                 <check key="embankment" text="Embankment" default="off" />
    1022                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    1023                 <check key="lit" text="Lit" default="off" />
    1024                 <check key="bicycle" text="Bicycle" default="off" />
     957                <reference ref="name_layer" />
     958                <reference ref="surface" />
     959                <reference ref="highway_yesno_incline" />
     960                <check key="lit" text="Lit" />
     961                <check key="bicycle" text="Bicycle" />
    1025962                <text key="width" text="Width (meters)" />
    1026963            </optional>
    1027964        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    1036973            <label text="Edit Flight of Steps" />
    1037974            <key key="highway" value="steps" />
    1038975            <optional>
    1039                 <text key="name" text="Name" />
    1040                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1041                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     976                <reference ref="name_layer" />
     977                <reference ref="surface" />
    1042978                <text key="step_count" text="Amount of Steps" />
    1043                 <check key="oneway" text="Oneway" default="off" />
    1044                 <check key="bridge" text="Bridge" default="off" />
    1045                 <check key="tunnel" text="Tunnel" default="off" />
    1046                 <check key="cutting" text="Cutting" default="off" />
    1047                 <check key="embankment" text="Embankment" default="off" />
    1048                 <check key="lit" text="Lit" default="off" />
     979                <reference ref="highway_yesno_incline_oneway_lit" />
    1049980                <text key="width" text="Width (meters)" />
    1050981            </optional>
    1051982        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    10771008            <optional>
    10781009                <text key="name" text="Name" />
    10791010                <text key="operator" text="Operator" />
    1080                 <check key="toilets" text="Toilets" default="off" />
     1011                <check key="toilets" text="Toilets" />
    10811012            </optional>
    10821013        </item>
    10831014        <item name="Rest Area" icon="presets/parking.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    10931024            <key key="highway" value="rest_area" />
    10941025            <optional>
    10951026                <text key="name" text="Name" />
    1096                 <check key="toilets" text="Toilets" default="off" />
    1097                 <check key="drinking_water" text="Drinking Water" default="off" />
     1027                <check key="toilets" text="Toilets" />
     1028                <check key="drinking_water" text="Drinking Water" />
    10981029            </optional>
    10991030        </item>
    11001031        <separator/>
    … … Note that for a match, at least one positive and no negative is required.  
    11091040            <optional text="Optional crossing attributes:">
    11101041                 <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    11111042                 <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" />
    1112                  <check key="supervised" text="Crossing attendant" default="off" />
    1113                  <check key="bicycle" text="Cross by bicycle" default="off" />
    1114                  <check key="horse" text="Cross on horseback" default="off" />
     1043                 <check key="supervised" text="Crossing attendant" />
     1044                 <check key="bicycle" text="Cross by bicycle" />
     1045                 <check key="horse" text="Cross on horseback" />
    11151046            </optional>
    11161047        </item>
    11171048        <item name="Stop" icon="presets/Stop.png" type="node">
    … … Note that for a match, at least one positive and no negative is required.  
    11461077            <key key="highway" value="crossing" />
    11471078            <combo key="crossing" text="Pedestrian crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    11481079            <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
    1149             <check key="supervised" text="Crossing attendant" default="off" />
    1150             <check key="bicycle" text="Cross by bicycle" default="off" />
    1151             <check key="horse" text="Cross on horseback" default="off" />
     1080            <check key="supervised" text="Crossing attendant" />
     1081            <check key="bicycle" text="Cross by bicycle" />
     1082            <check key="horse" text="Cross on horseback" />
    11521083        </item>
    11531084        <item name="Traffic Calming" icon="presets/chicane.png" type="node,way">
    11541085            <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
    … … Note that for a match, at least one positive and no negative is required.  
    12341165                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=block" />
    12351166            <label text="Edit Block" />
    12361167            <key key="barrier" value="block" />
    1237             <optional text="Allowed traffic:">
    1238                 <check key="foot" text="Foot" default="on" />
    1239                 <check key="bicycle" text="Bicycle" default="on" />
    1240                 <check key="horse" text="Horse" default="off" />
    1241                 <check key="motorcycle" text="Motorcycle" default="off" />
    1242             </optional>
     1168            <reference ref="barrier_4" />
    12431169            <optional>
    12441170                <text key="maxwidth" text="Max. width (meters)" length="7" />
    12451171                <combo key="material" text="Material" values="concrete,stone" />
    … … Note that for a match, at least one positive and no negative is required.  
    12571183            <space />
    12581184            <key key="barrier" value="bollard" />
    12591185            <combo key="bollard" text="Bollard type" values="rising,removable" />
    1260             <optional text="Allowed traffic:">
    1261                 <check key="foot" text="Foot" default="on" />
    1262                 <check key="bicycle" text="Bicycle" default="on" />
    1263                 <check key="horse" text="Horse" default="off" />
    1264                 <check key="motorcycle" text="Motorcycle" default="off" />
    1265             </optional>
     1186            <reference ref="barrier_4" />
    12661187            <optional>
    12671188                <text key="maxwidth" text="Max. width (meters)" length="7" />
    12681189                <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
    … … Note that for a match, at least one positive and no negative is required.  
    12751196                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cycle_barrier" />
    12761197            <label text="Edit Cycle Barrier" />
    12771198            <key key="barrier" value="cycle_barrier" />
    1278             <optional text="Allowed traffic:">
    1279                 <check key="foot" text="Foot" default="on" />
    1280                 <check key="bicycle" text="Bicycle" default="on" />
    1281                 <check key="horse" text="Horse" default="off" />
    1282                 <check key="motorcycle" text="Motorcycle" default="off" />
    1283             </optional>
    1284             <optional>
    1285                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1286             </optional>
     1199            <reference ref="barrier_4" />
     1200            <reference ref="optional_maxwidth" />
    12871201        </item> <!-- cycle_barrier -->
    12881202        <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node">
    12891203            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
    12901204            <label text="Edit Cattle Grid" />
    12911205            <key key="barrier" value="cattle_grid" />
    1292             <optional text="Allowed traffic:">
    1293                 <check key="foot" text="Foot" default="on" />
    1294                 <check key="bicycle" text="Bicycle" default="on" />
    1295                 <check key="motorcycle" text="Motorcycle" default="off" />
    1296                 <check key="motorcar" text="Motorcar" default="off" />
    1297             </optional>
     1206            <reference ref="barrier_4" />
    12981207        </item> <!-- cattle_grid -->
    12991208        <item name="Bus Trap" icon="presets/empty.png" type="node">
    13001209            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
    13011210                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bus_trap" />
    13021211            <label text="Edit Bus Trap" />
    13031212            <key key="barrier" value="bus_trap" />
    1304             <optional>
    1305                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1306             </optional>
     1213            <reference ref="optional_maxwidth" />
    13071214        </item> <!-- bus_trap -->
    13081215        <item name="Spikes" icon="presets/empty.png" type="node">
    13091216            <label text="Edit Spikes" />
    13101217            <key key="barrier" value="spikes" />
    1311             <optional text="Allowed traffic:">
    1312                 <check key="foot" text="Foot" default="on" />
    1313                 <check key="bicycle" text="Bicycle" default="on" />
    1314                 <check key="horse" text="Horse" default="off" />
    1315                 <check key="motorcycle" text="Motorcycle" default="off" />
    1316                 <check key="motorcar" text="Motorcar" default="off" />
    1317             </optional>
     1218            <reference ref="barrier_5" />
    13181219        </item> <!-- spikes -->
    13191220        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway">
    13201221            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
    … … Note that for a match, at least one positive and no negative is required.  
    13351236        <item name="Border Control" icon="presets/douane.png" type="node">
    13361237            <label text="Edit Border Control" />
    13371238            <key key="barrier" value="border_control" />
    1338             <optional text="Allowed traffic:">
    1339                 <check key="foot" text="Foot" default="on" />
    1340                 <check key="bicycle" text="Bicycle" default="on" />
    1341                 <check key="horse" text="Horse" default="off" />
    1342                 <check key="motorcycle" text="Motorcycle" default="off" />
    1343                 <check key="motorcar" text="Motorcar" default="off" />
    1344             </optional>
     1239            <reference ref="barrier_5" />
    13451240        </item> <!-- border_control -->
    13461241        <separator/> <!-- *** linear barriers *** -->
    13471242        <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation">
    … … Note that for a match, at least one positive and no negative is required.  
    13831278                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
    13841279            <label text="Edit Guard Rail" />
    13851280            <key key="barrier" value="guard_rail" />
    1386             <optional>
    1387                 <text key="height" text="Height (meters)" length="7" />
    1388             </optional>
     1281            <reference ref="optional_height" />
    13891282        </item> <!-- guard_rail -->
    13901283        <item name="Wall" icon="presets/wall.png" type="way,closedway">
    13911284            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
    … … Note that for a match, at least one positive and no negative is required.  
    13981291                  zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=wall" />
    13991292            <label text="Edit Wall" />
    14001293            <key key="barrier" value="wall" />
    1401             <optional>
    1402                 <text key="height" text="Height (meters)" length="7" />
    1403             </optional>
     1294            <reference ref="optional_height" />
    14041295        </item> <!-- wall -->
    14051296        <item name="City Wall" icon="presets/city_wall.png" type="way,closedway">
    14061297            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
    … … Note that for a match, at least one positive and no negative is required.  
    14091300                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=city_wall" />
    14101301            <label text="Edit City Wall" />
    14111302            <key key="barrier" value="city_wall" />
    1412             <optional>
    1413                 <text key="height" text="Height (meters)" length="7" />
    1414             </optional>
     1303            <reference ref="optional_height" />
    14151304        </item> <!-- city_wall -->
    14161305        <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway">
    14171306            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
    … … Note that for a match, at least one positive and no negative is required.  
    14231312                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=retaining_wall" />
    14241313            <label text="Edit Retaining Wall" />
    14251314            <key key="barrier" value="retaining_wall" />
    1426             <optional>
    1427                 <text key="height" text="Height (meters)" length="7" />
    1428             </optional>
     1315            <reference ref="optional_height" />
    14291316        </item> <!-- retaining_wall -->
    14301317        <item name="Ditch" name_context="Barrier" type="way">
    14311318            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
    … … Note that for a match, at least one positive and no negative is required.  
    14421329        <item name="Kerb" type="way,closedway">
    14431330            <label text="Edit Kerb" />
    14441331            <key key="barrier" value="kerb" />
    1445             <optional>
    1446                 <text key="height" text="Height (meters)" length="7" />
    1447             </optional>
     1332            <reference ref="optional_height" />
    14481333        </item> <!-- kerb -->
    14491334        <separator/> <!-- *** access *** -->
    14501335        <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node">
    … … Note that for a match, at least one positive and no negative is required.  
    14531338                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=entrance" />
    14541339            <label text="Edit Entrance (barrier opening)" />
    14551340            <key key="barrier" value="entrance" />
    1456             <optional text="Allowed traffic:">
    1457                 <check key="foot" text="Foot" default="on" />
    1458                 <check key="bicycle" text="Bicycle" default="on" />
    1459                 <check key="horse" text="Horse" default="off" />
    1460                 <check key="motorcycle" text="Motorcycle" default="off" />
    1461                 <check key="motorcar" text="Motorcar" default="off" />
    1462             </optional>
    1463             <optional>
    1464                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1465             </optional>
     1341            <reference ref="barrier_5" />
     1342            <reference ref="optional_maxwidth" />
    14661343        </item> <!-- entrance -->
    14671344        <item name="Gate" icon="presets/gate.png" type="node">
    14681345            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
    … … Note that for a match, at least one positive and no negative is required.  
    14741351                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=gate" />
    14751352            <label text="Edit Gate" />
    14761353            <key key="barrier" value="gate" />
    1477             <optional text="Allowed traffic:">
    1478                 <check key="foot" text="Foot" default="on" />
    1479                 <check key="bicycle" text="Bicycle" default="on" />
    1480                 <check key="horse" text="Horse" default="off" />
    1481                 <check key="motorcycle" text="Motorcycle" default="off" />
    1482                 <check key="motorcar" text="Motorcar" default="off" />
    1483             </optional>
    1484             <optional>
    1485                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1486             </optional>
     1354            <reference ref="barrier_5" />
     1355            <reference ref="optional_maxwidth" />
    14871356        </item> <!-- gate -->
    14881357        <item name="Lift Gate" icon="presets/lift_gate.png" type="node">
    14891358            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
    … … Note that for a match, at least one positive and no negative is required.  
    14941363                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=lift_gate" />
    14951364            <label text="Edit Lift Gate" />
    14961365            <key key="barrier" value="lift_gate" />
    1497             <optional text="Allowed traffic:">
    1498                 <check key="foot" text="Foot" default="on" />
    1499                 <check key="bicycle" text="Bicycle" default="on" />
    1500                 <check key="horse" text="Horse" default="off" />
    1501                 <check key="motorcycle" text="Motorcycle" default="off" />
    1502                 <check key="motorcar" text="Motorcar" default="off" />
    1503             </optional>
    1504             <optional>
    1505                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1506             </optional>
     1366            <reference ref="barrier_5" />
     1367            <reference ref="optional_maxwidth" />
    15071368        </item> <!-- lift_gate -->
    15081369        <item name="Hampshire Gate" icon="presets/empty.png" type="node">
    15091370            <label text="Edit Hampshire Gate" />
    15101371            <key key="barrier" value="hampshire_gate" />
    1511             <optional text="Allowed traffic:">
    1512                 <check key="foot" text="Foot" default="on" />
    1513                 <check key="bicycle" text="Bicycle" default="on" />
    1514                 <check key="horse" text="Horse" default="off" />
    1515                 <check key="motorcycle" text="Motorcycle" default="off" />
    1516                 <check key="motorcar" text="Motorcar" default="off" />
    1517             </optional>
    1518             <optional>
    1519                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1520             </optional>
     1372            <reference ref="barrier_5" />
     1373            <reference ref="optional_maxwidth" />
    15211374        </item> <!-- hampshire_gate -->
    15221375        <item name="Bump Gate" icon="presets/empty.png" type="node">
    15231376            <label text="Edit Bump Gate" />
    15241377            <key key="barrier" value="bump_gate" />
    1525             <optional text="Allowed traffic:">
    1526                 <check key="foot" text="Foot" default="on" />
    1527                 <check key="bicycle" text="Bicycle" default="on" />
    1528                 <check key="horse" text="Horse" default="off" />
    1529                 <check key="motorcycle" text="Motorcycle" default="off" />
    1530                 <check key="motorcar" text="Motorcar" default="off" />
    1531             </optional>
    1532             <optional>
    1533                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1534             </optional>
     1378            <reference ref="barrier_5" />
     1379            <reference ref="optional_maxwidth" />
    15351380        </item> <!-- bump_gate -->
    15361381        <item name="Kissing Gate" icon="presets/empty.png" type="node">
    15371382            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate" />
    15381383            <label text="Edit Kissing Gate" />
    15391384            <key key="barrier" value="kissing_gate" />
    1540             <optional text="Allowed traffic:">
    1541                 <check key="foot" text="Foot" default="on" />
    1542                 <check key="bicycle" text="Bicycle" default="off" />
    1543             </optional>
    1544             <optional>
    1545                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1546             </optional>
     1385            <reference ref="barrier_2" />
     1386            <reference ref="optional_maxwidth" />
    15471387        </item> <!-- kissing_gate -->
    15481388        <item name="Chain" type="node">
    15491389            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
    15501390                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
    15511391            <label text="Edit Chain" />
    15521392            <key key="barrier" value="chain" />
    1553             <optional text="Allowed traffic:">
    1554                 <check key="foot" text="Foot" default="on" />
    1555                 <check key="bicycle" text="Bicycle" default="on" />
    1556                 <check key="horse" text="Horse" default="off" />
    1557                 <check key="motorcycle" text="Motorcycle" default="off" />
    1558                 <check key="motorcar" text="Motorcar" default="off" />
    1559             </optional>
    1560             <optional>
    1561                 <text key="maxwidth" text="Max. width (meters)" length="7" />
    1562             </optional>
     1393            <reference ref="barrier_5" />
     1394            <reference ref="optional_maxwidth" />
    15631395        </item> <!-- chain -->
    15641396        <item name="Stile" icon="presets/stile.png" type="node">
    15651397            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
    … … Note that for a match, at least one positive and no negative is required.  
    15701402            <optional>
    15711403                <combo key="material" text="Material" values="metal,stone,wood" />
    15721404            </optional>
    1573             <optional text="Allowed traffic:">
    1574                 <check key="foot" text="Foot" default="on" />
    1575                 <check key="bicycle" text="Bicycle" default="off" />
    1576             </optional>
     1405            <reference ref="barrier_2" />
    15771406        </item> <!-- stile -->
    15781407        <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node">
    15791408            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile"
    … … Note that for a match, at least one positive and no negative is required.  
    15811410                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=stile" />
    15821411            <label text="Edit Turnstile" />
    15831412            <key key="barrier" value="turnstile" />
    1584             <optional text="Allowed traffic:">
    1585                 <check key="foot" text="Foot" default="on" />
    1586                 <check key="bicycle" text="Bicycle" default="off" />
    1587             </optional>
     1413            <reference ref="barrier_2" />
    15881414        </item> <!-- turnstile -->
    15891415        <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node">
    15901416            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=sally_port" />
    15911417            <label text="Edit Sally Port" />
    15921418            <key key="barrier" value="sally_port" />
    1593             <optional text="Allowed traffic:">
    1594                 <check key="foot" text="Foot" default="on" />
    1595                 <check key="bicycle" text="Bicycle" default="on" />
    1596                 <check key="horse" text="Horse" default="off" />
    1597                 <check key="motorcycle" text="Motorcycle" default="off" />
    1598                 <check key="motorcar" text="Motorcar" default="off" />
    1599             </optional>
     1419            <reference ref="barrier_5" />
    16001420            <optional>
    16011421                <text key="maxheight" text="Max. height (meters)" length="7" />
    16021422                <text key="maxwidth" text="Max. width (meters)" length="7" />
    … … Note that for a match, at least one positive and no negative is required.  
    16191439            <optional>
    16201440                <text key="name" text="Name" />
    16211441                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
    1622                 <text key="maxspeed" text="Max. speed (km/h)" />
    16231442                <text key="width" text="Width (meters)" />
     1443                <text key="maxspeed" text="Max. speed (km/h)" />
    16241444                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    16251445                <check key="toll" text="Toll" />
    16261446            </optional>
    … … Note that for a match, at least one positive and no negative is required.  
    16381458            <label text="Edit Building Passage" />
    16391459            <key key="tunnel" value="building_passage" />
    16401460            <optional>
    1641                 <text key="name" text="Name" />
    1642                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    1643                 <text key="maxspeed" text="Max. speed (km/h)" />
     1461                <reference ref="name_layer" />
    16441462                <text key="width" text="Width (meters)" />
     1463                <text key="maxspeed" text="Max. speed (km/h)" />
    16451464                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    16461465            </optional>
    16471466        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    16591478            <check key="arcade:left" value_on="open" text="Open on left side" />
    16601479            <check key="arcade:right" value_on="open" text="Open on right side" />
    16611480            <optional>
    1662                 <text key="name" text="Name" />
    1663                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1481                <reference ref="name_layer" />
    16641482                <text key="width" text="Width (meters)" />
    16651483            </optional>
    16661484        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    16761494            <check key="colonnade:left" value_on="open" text="Open on left side" />
    16771495            <check key="colonnade:right" value_on="open" text="Open on right side" />
    16781496            <optional>
    1679                 <text key="name" text="Name" />
    1680                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1497                <reference ref="name_layer" />
    16811498                <text key="width" text="Width (meters)" />
    16821499            </optional>
    16831500        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    16971514            <check key="avalanche_protector:left" value_on="open" text="Open on left side" />
    16981515            <check key="avalanche_protector:right" value_on="open" text="Open on right side" />
    16991516            <optional>
    1700                 <text key="name" text="Name" />
    1701                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     1517                <reference ref="name_layer" />
    17021518                <text key="width" text="Width (meters)" />
    17031519                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    17041520            </optional>
    … … Note that for a match, at least one positive and no negative is required.  
    18291645                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
    18301646                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=groyne"
    18311647                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
    1832             <key key="man_made" value="groyne" />                               
     1648            <key key="man_made" value="groyne" />
    18331649        </item>
    18341650        <item name="Breakwater" icon="presets/groyne.png" type="way,closedway">
    18351651            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
    … … Note that for a match, at least one positive and no negative is required.  
    21842000            <key key="highway" value="bus_guideway" />
    21852001            <optional>
    21862002                <text key="name" text="Name" />
    2187                 <check key="oneway" text="Oneway" default="off" />
    2188                 <check key="bridge" text="Bridge" default="off" />
    2189                 <check key="tunnel" text="Tunnel" default="off" />
    2190                 <check key="cutting" text="Cutting" default="off" />
    2191                 <check key="embankment" text="Embankment" default="off" />
     2003                <reference ref="highway_yesno_incline_oneway" />
    21922004                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    2193                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     2005                <reference ref="surface" />
    21942006                <text key="maxspeed" text="Max. speed (km/h)" />
    21952007                <text key="width" text="Width (meters)" />
    2196                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
    21972008            </optional>
    21982009        </item>
    21992010        <separator/>
    … … Note that for a match, at least one positive and no negative is required.  
    22312042            <label text="Edit Level Crossing" />
    22322043            <key key="railway" value="level_crossing" />
    22332044            <optional>
    2234                 <check key="supervised" text="Supervised" default="off" />
    2235                 <check key="crossing:light" text="Traffic lights" default="off" />
    2236                 <check key="crossing:bell" text="Sound signals" default="off" />
     2045                <check key="supervised" text="Supervised" />
     2046                <check key="crossing:light" text="Traffic lights" />
     2047                <check key="crossing:bell" text="Sound signals" />
    22372048                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    22382049            </optional>
    22392050        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    22492060            <key key="railway" value="crossing" />
    22502061            <optional>
    22512062                <combo key="crossing" text="Crossing type" values="uncontrolled,traffic_signals,island,unmarked,no,unknown" />
    2252                 <check key="horse" text="Cross on horseback" default="off" />
    2253                 <check key="bicycle" text="Cross by bicycle" default="off" />
    2254                 <check key="supervised" text="Supervised" default="off" />
    2255                 <check key="crossing:light" text="Traffic lights" default="off" />
    2256                 <check key="crossing:bell" text="Sound signals" default="off" />
     2063                <check key="horse" text="Cross on horseback" />
     2064                <check key="bicycle" text="Cross by bicycle" />
     2065                <check key="supervised" text="Supervised" />
     2066                <check key="crossing:light" text="Traffic lights" />
     2067                <check key="crossing:bell" text="Sound signals" />
    22572068                <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
    22582069            </optional>
    22592070        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    22762087            <label text="Edit Chair Lift" />
    22772088            <space />
    22782089            <key key="aerialway" value="chair_lift" />
    2279             <text key="name" text="Name" />
    2280             <text key="ref" text="Reference number" />
     2090            <reference ref="name_ref" />
    22812091            <optional>
    22822092                <text key="aerialway:capacity" text="Number of people per hour" />
    22832093                <text key="aerialway:occupancy" text="Number of people per chair" />
    22842094                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2285                 <check key="aerialway:bubble" text="Has bubble?" default="off" />
    2286                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2095                <check key="aerialway:bubble" text="Has bubble?" />
     2096                <check key="aerialway:heating" text="Has heating?" />
    22872097            </optional>
    22882098        </item>
    22892099        <item name="Drag Lift" icon="presets/drag_lift.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    22912101            <label text="Edit Drag Lift" />
    22922102            <space />
    22932103            <key key="aerialway" value="drag_lift" />
    2294             <text key="name" text="Name" />
    2295             <text key="ref" text="Reference number" />
     2104            <reference ref="name_ref" />
    22962105            <optional>
    22972106                <text key="aerialway:capacity" text="Number of people per hour" />
    22982107                <text key="aerialway:duration" text="Typical journey time in minutes" />
    … … Note that for a match, at least one positive and no negative is required.  
    23082117            <label text="Edit Cable Car" />
    23092118            <space />
    23102119            <key key="aerialway" value="cable_car" />
    2311             <text key="name" text="Name" />
    2312             <text key="ref" text="Reference number" />
     2120            <reference ref="name_ref" />
    23132121            <optional>
    23142122                <text key="aerialway:capacity" text="Number of people per hour" />
    23152123                <text key="aerialway:occupancy" text="Number of people per car" />
    23162124                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2317                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2125                <check key="aerialway:heating" text="Has heating?" />
    23182126            </optional>
    23192127        </item>
    23202128        <item name="Gondola" icon="presets/gondola.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    23252133            <label text="Edit Gondola" />
    23262134            <space />
    23272135            <key key="aerialway" value="gondola" />
    2328             <text key="name" text="Name" />
    2329             <text key="ref" text="Reference number" />
     2136            <reference ref="name_ref" />
    23302137            <optional>
    23312138                <text key="aerialway:capacity" text="Number of people per hour" />
    23322139                <text key="aerialway:occupancy" text="Number of people per gondola" />
    23332140                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2334                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2141                <check key="aerialway:heating" text="Has heating?" />
    23352142            </optional>
    23362143        </item>
    23372144        <item name="Mixed Lift" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    23392146            <label text="Edit Mixed Lift (containing both gondolas and chairs)" />
    23402147            <space />
    23412148            <key key="aerialway" value="mixed_lift" />
    2342             <text key="name" text="Name" />
    2343             <text key="ref" text="Reference number" />
     2149            <reference ref="name_ref" />
    23442150            <optional>
    23452151                <text key="aerialway:capacity" text="Number of people per hour" />
    23462152                <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
    23472153                <text key="aerialway:duration" text="Typical journey time in minutes" />
    2348                 <check key="aerialway:bubble" text="Has bubble?" default="off" />
    2349                 <check key="aerialway:heating" text="Has heating?" default="off" />
     2154                <check key="aerialway:bubble" text="Has bubble?" />
     2155                <check key="aerialway:heating" text="Has heating?" />
    23502156            </optional>
    23512157        </item>
    23522158        <item name="T-bar Lift" icon="presets/drag_lift.png" type="way">
    … … Note that for a match, at least one positive and no negative is required.  
    23572163            <label text="Edit T-bar Lift" />
    23582164            <space />
    23592165            <key key="aerialway" value="t-bar" />
    2360             <text key="name" text="Name" />
    2361             <text key="ref" text="Reference number" />
     2166            <reference ref="name_ref" />
    23622167            <optional>
    23632168                <text key="aerialway:capacity" text="Number of people per hour" />
    23642169                <text key="aerialway:duration" text="Typical journey time in minutes" />
    … … Note that for a match, at least one positive and no negative is required.  
    23692174            <label text="Edit J-bar Lift" />
    23702175            <space />
    23712176            <key key="aerialway" value="j-bar" />
    2372             <text key="name" text="Name" />
    2373             <text key="ref" text="Reference number" />
     2177            <reference ref="name_ref" />
    23742178            <optional>
    23752179                <text key="aerialway:capacity" text="Number of people per hour" />
    23762180                <text key="aerialway:duration" text="Typical journey time in minutes" />
    … … Note that for a match, at least one positive and no negative is required.  
    23812185            <label text="Edit Platter Lift" />
    23822186            <space />
    23832187            <key key="aerialway" value="platter" />
    2384             <text key="name" text="Name" />
    2385             <text key="ref" text="Reference number" />
     2188            <reference ref="name_ref" />
    23862189            <optional>
    23872190                <text key="aerialway:capacity" text="Number of people per hour" />
    23882191                <text key="aerialway:duration" text="Typical journey time in minutes" />
    … … Note that for a match, at least one positive and no negative is required.  
    23932196            <label text="Edit Rope Tow" />
    23942197            <space />
    23952198            <key key="aerialway" value="rope_tow" />
    2396             <text key="name" text="Name" />
    2397             <text key="ref" text="Reference number" />
     2199            <reference ref="name_ref" />
    23982200            <optional>
    23992201                <text key="aerialway:capacity" text="Number of people per hour" />
    24002202                <text key="aerialway:duration" text="Typical journey time in minutes" />
    … … Note that for a match, at least one positive and no negative is required.  
    24052207            <label text="Edit Magic Carpet" />
    24062208            <space />
    24072209            <key key="aerialway" value="magic_carpet" />
    2408             <text key="name" text="Name" />
    2409             <text key="ref" text="Reference number" />
     2210            <reference ref="name_ref" />
    24102211            <optional>
    24112212                <text key="aerialway:capacity" text="Number of people per hour" />
    24122213                <text key="aerialway:duration" text="Typical journey time in minutes" />
    … … Note that for a match, at least one positive and no negative is required.  
    24162217            <label text="Edit Goods" />
    24172218            <space />
    24182219            <key key="aerialway" value="goods" />
    2419             <text key="name" text="Name" />
    2420             <text key="ref" text="Reference number" />
     2220            <reference ref="name_ref" />
    24212221            <optional>
    24222222                <text key="aerialway:duration" text="Typical journey time in minutes" />
    24232223            </optional>
    … … Note that for a match, at least one positive and no negative is required.  
    24872287            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
    24882288            <combo key="fee" text="Fee" values="yes,no,interval" />
    24892289            <text key="operator" text="Operator" />
    2490             <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     2290            <reference ref="surface" />
    24912291            <combo key="covered" text="Covered (with roof)" values="yes,no" />
    24922292            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
    24932293            <combo key="supervised" text="Supervised" values="yes,no,interval" />
    24942294            <combo key="lit" text="Lit" values="yes,no,interval" />
    2495             <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" />
     2295            <reference ref="oh" />
    24962296        </item>
    24972297        <item name="Parking entrance" icon="presets/parking.png" type="node">
    24982298            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
    … … Note that for a match, at least one positive and no negative is required.  
    25102310            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
    25112311            <combo key="fee" text="Fee" values="yes,no,interval" />
    25122312            <text key="operator" text="Operator" />
    2513             <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
     2313            <reference ref="surface" />
    25142314            <combo key="covered" text="Covered (with roof)" values="yes,no" />
    25152315            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
    25162316            <combo key="supervised" text="Supervised" values="yes,no,interval" />
    25172317            <combo key="lit" text="Lit" values="yes,no,interval" />
    2518             <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" />
     2318            <reference ref="oh" />
    25192319        </item>
    25202320        <separator/>
    25212321        <item name="Fuel" icon="presets/fuel.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    25372337            <optional>
    25382338                <text key="name" text="Name" />
    25392339                <text key="operator" text="Operator" />
    2540                 <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" />
     2340                <reference ref="oh" />
    25412341                <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
    25422342                <label text="Fuel types:" />
    25432343                <checkgroup columns="2">
    2544                     <check key="fuel:diesel" text="Diesel" default="off" />
    2545                     <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
    2546                     <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
    2547                     <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
    2548                     <check key="fuel:octane_80" text="Octane 80" default="off" />
    2549                     <check key="fuel:octane_91" text="Octane 91" default="off" />
    2550                     <check key="fuel:octane_92" text="Octane 92" default="off" />
    2551                     <check key="fuel:octane_95" text="Octane 95" default="off" />
    2552                     <check key="fuel:octane_98" text="Octane 98" default="off" />
    2553                     <check key="fuel:octane_100" text="Octane 100" default="off" />
    2554                     <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
    2555                     <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
    2556                     <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
    2557                     <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
    2558                     <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
    2559                     <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
     2344                    <check key="fuel:diesel" text="Diesel" />
     2345                    <check key="fuel:biodiesel" text="Bio Diesel" />
     2346                    <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" />
     2347                    <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" />
     2348                    <check key="fuel:octane_80" text="Octane 80" />
     2349                    <check key="fuel:octane_91" text="Octane 91" />
     2350                    <check key="fuel:octane_92" text="Octane 92" />
     2351                    <check key="fuel:octane_95" text="Octane 95" />
     2352                    <check key="fuel:octane_98" text="Octane 98" />
     2353                    <check key="fuel:octane_100" text="Octane 100" />
     2354                    <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
     2355                    <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
     2356                    <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" />
     2357                    <check key="fuel:cng" text="CNG (Compressed Natural Gas)" />
     2358                    <check key="fuel:1_25" text="1/25 mix (mofa/moped)" />
     2359                    <check key="fuel:1_50" text="1/50 mix (mofa/moped)" />
    25602360                </checkgroup>
    25612361            </optional>
    25622362        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    25682368            <text key="operator" text="Operator" />
    25692369            <text key="voltage" text="Voltage" />
    25702370            <text key="amperage" text="Amperage" />
    2571         </item>           
     2371        </item>
    25722372        <item name="Wash" icon="presets/car_wash.png" type="node,closedway">
    25732373            <label text="Edit Car Wash" />
    25742374            <space />
    25752375            <key key="amenity" value="car_wash" />
    2576             <text key="name" text="Name" />
    2577             <text key="brand" text="Brand" />
    2578             <text key="operator" text="Operator" />
    2579             <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" />
     2376            <reference ref="name_brand_operator_oh" />
    25802377        </item>
    25812378        <separator/>
    25822379        <item name="Car Dealer" icon="presets/car.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    25902387            <label text="Edit Car Shop" />
    25912388            <space />
    25922389            <key key="shop" value="car" />
    2593             <text key="name" text="Name" />
    2594             <text key="brand" text="Brand" />
    2595             <text key="operator" text="Operator" />
    2596             <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" />
     2390            <reference ref="name_brand_operator_oh" />
    25972391        </item>
    25982392        <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
    25992393            <label text="Edit Car Repair" />
    26002394            <space />
    26012395            <key key="shop" value="car_repair" />
    2602             <text key="name" text="Name" />
    2603             <text key="brand" text="Brand" />
    2604             <text key="operator" text="Operator" />
    2605             <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" />
     2396            <reference ref="name_brand_operator_oh" />
    26062397        </item>
    26072398        <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
    26082399            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
    … … Note that for a match, at least one positive and no negative is required.  
    26102401            <label text="Edit Car Parts" />
    26112402            <space />
    26122403            <key key="shop" value="car_parts" />
    2613             <text key="name" text="Name" />
    2614             <text key="brand" text="Brand" />
    2615             <text key="operator" text="Operator" />
    2616             <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" />
     2404            <reference ref="name_brand_operator_oh" />
    26172405        </item>
    26182406        <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
    26192407            <label text="Edit Tyres" />
    26202408            <space />
    26212409            <key key="shop" value="tyres" />
    2622             <text key="name" text="Name" />
    2623             <text key="brand" text="Brand" />
    2624             <text key="operator" text="Operator" />
    2625             <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" />
     2410            <reference ref="name_brand_operator_oh" />
    26262411            <label text="Contact:" />
    26272412                <text key="phone" text="Phone Number" />
    26282413                <text key="fax" text="Fax Number" />
    … … Note that for a match, at least one positive and no negative is required.  
    26392424            <label text="Edit Car Rental" />
    26402425            <space />
    26412426            <key key="amenity" value="car_rental" />
    2642             <text key="name" text="Name" />
    2643             <text key="brand" text="Brand" />
    2644             <text key="operator" text="Operator" />
    2645             <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" />
     2427            <reference ref="name_brand_operator_oh" />
    26462428            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    26472429        </item>
    26482430        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    26582440            <key key="amenity" value="car_sharing" />
    26592441            <text key="operator" text="Operator" />
    26602442            <text key="capacity" text="Capacity" />
    2661             <text key="name" text="Name" />
    2662             <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" />
     2443            <reference ref="name_oh" />
    26632444            <text key="website" text="Website" />
    26642445        </item>
    26652446    </group> <!-- Car -->
    … … Note that for a match, at least one positive and no negative is required.  
    26842465            <text key="name" text="Name" />
    26852466            <combo key="brand" text="Brand" values="independent" />
    26862467            <text key="operator" text="Operator" />
    2687             <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" />
     2468            <reference ref="oh" />
    26882469            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    26892470            <optional text="Services:">
    26902471                <combo key="sale" text="Sale" values="yes,brand,no" />
    … … Note that for a match, at least one positive and no negative is required.  
    27172498            <label text="Edit Bicycle Parking" />
    27182499            <space />
    27192500            <key key="amenity" value="bicycle_parking" />
    2720             <text key="name" text="Name" />
    2721             <text key="operator" text="Operator" />
     2501            <reference ref="name_operator" />
    27222502            <text key="capacity" text="Capacity" />
    27232503            <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,shed,stands,wall_loops" />
    2724             <check key="covered" text="Covered" default="off" />
    2725             <check key="supervised" text="Supervised" default="off" />
     2504            <check key="covered" text="Covered" />
     2505            <check key="supervised" text="Supervised" />
    27262506        </item>
    27272507        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway">
    27282508            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
    … … Note that for a match, at least one positive and no negative is required.  
    27712551            <space />
    27722552            <key key="type" value="route" />
    27732553            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" />
    2774             <text key="name" text="Name" />
    2775             <text key="ref" text="Reference" />
     2554            <reference ref="name_ref" />
    27762555            <optional>
    27772556                <text key="from" text="From (initial stop)" />
    27782557                <text key="to" text="To (terminal stop)" />
    … … Note that for a match, at least one positive and no negative is required.  
    27982577            <space />
    27992578            <key key="type" value="route_master" />
    28002579            <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
    2801             <text key="name" text="Name" />
    2802             <text key="ref" text="Reference" />
     2580            <reference ref="name_ref" />
    28032581            <optional>
    28042582                <text key="operator" text="Operator" />
    28052583                <text key="network" text="Network" />
    … … Note that for a match, at least one positive and no negative is required.  
    29132691            <key key="railway" value="subway_entrance" />
    29142692            <optional>
    29152693                <text key="name" text="Name" />
    2916                 <check key="wheelchair" text="Wheelchair" default="off" />
    2917                 <check key="bicycle" text="Bicycle" default="off" />
     2694                <check key="wheelchair" text="Wheelchair" />
     2695                <check key="bicycle" text="Bicycle" />
    29182696            </optional>
    29192697        </item>
    29202698        <item name="Ticket Machine" icon="presets/vending_machine.png" type="node">
    … … Note that for a match, at least one positive and no negative is required.  
    29272705            <space />
    29282706            <key key="amenity" value="vending_machine" />
    29292707            <key key="vending" value="public_transport_tickets" />
    2930             <text key="name" text="Name" />
    2931             <text key="operator" text="Operator" />
     2708            <reference ref="name_operator" />
    29322709            <text key="ref" text="Reference Number" />
    2933             <check key="payment:coins" text="Coins" default="off" />
    2934             <check key="payment:notes" text="Notes" default="off" />
    2935             <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
    2936             <check key="payment:debit_cards" text="Debit cards" default="off" />
    2937             <check key="payment:credit_cards" text="Credit cards" default="off" />
    2938             <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
     2710            <check key="payment:coins" text="Coins" />
     2711            <check key="payment:notes" text="Notes" />
     2712            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
     2713            <check key="payment:debit_cards" text="Debit cards" />
     2714            <check key="payment:credit_cards" text="Credit cards" />
     2715            <check key="payment:account_cards" text="Account or loyalty cards" />
    29392716        </item>
    29402717    </group>
    29412718    <group name="Public Transport (legacy)" icon="presets/bus.png">
    … … Note that for a match, at least one positive and no negative is required.  
    29842761            <key key="railway" value="platform" />
    29852762            <text key="ref" text="Reference (track number)" />
    29862763            <text key="width" text="Width (meters)" />
    2987             <check key="area" text="Area" default="off" />
     2764            <check key="area" text="Area" />
    29882765        </item>
    29892766        <separator/>
    29902767        <item name="Bus Station" icon="presets/bus.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    30232800            <key key="highway" value="platform" />
    30242801            <text key="ref" text="Reference (track number)" />
    30252802            <text key="width" text="Width (meters)" />
    3026             <check key="area" text="Area" default="off" />
     2803            <check key="area" text="Area" />
    30272804        </item>
    30282805    </group> <!-- Public Transport -->
    30292806    <item name="Taxi" icon="presets/taxi.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    31542931            <label text="Edit Hotel" />
    31552932            <space />
    31562933            <key key="tourism" value="hotel" />
    3157             <text key="name" text="Name" />
    3158             <text key="operator" text="Operator" />
     2934            <reference ref="name_operator" />
    31592935            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    31602936            <space />
    3161             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3162             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3163             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3164             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     2937            <reference ref="internet_smoking_wheelchair" />
    31652938            <space />
    3166             <text key="phone" text="Phone Number" />
    3167             <text key="fax" text="Fax Number" />
    3168             <text key="website" text="Website" />
    3169             <text key="email" text="Email Address" />
     2939            <reference ref="contact" />
    31702940        </item>
    31712941        <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway">
    31722942            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
    … … Note that for a match, at least one positive and no negative is required.  
    31762946            <label text="Edit Motel" />
    31772947            <space />
    31782948            <key key="tourism" value="motel" />
    3179             <text key="name" text="Name" />
    3180             <text key="operator" text="Operator" />
     2949            <reference ref="name_operator" />
    31812950            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    31822951            <space />
    3183             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3184             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3185             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3186             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     2952            <reference ref="internet_smoking_wheelchair" />
    31872953            <space />
    3188             <text key="phone" text="Phone Number" />
    3189             <text key="fax" text="Fax Number" />
    3190             <text key="website" text="Website" />
    3191             <text key="email" text="Email Address" />
     2954            <reference ref="contact" />
    31922955        </item>
    31932956        <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway">
    31942957            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
    … … Note that for a match, at least one positive and no negative is required.  
    31982961            <label text="Edit Guest House" />
    31992962            <space />
    32002963            <key key="tourism" value="guest_house" />
    3201             <text key="name" text="Name" />
    3202             <text key="operator" text="Operator" />
     2964            <reference ref="name_operator" />
    32032965            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32042966            <space />
    3205             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3206             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3207             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3208             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     2967            <reference ref="internet_smoking_wheelchair" />
    32092968            <space />
    3210             <text key="phone" text="Phone Number" />
    3211             <text key="fax" text="Fax Number" />
    3212             <text key="website" text="Website" />
    3213             <text key="email" text="Email Address" />
     2969            <reference ref="contact" />
    32142970        </item>
    32152971        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway">
    32162972            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
    … … Note that for a match, at least one positive and no negative is required.  
    32212977            <label text="Edit Chalet" />
    32222978            <space />
    32232979            <key key="tourism" value="chalet" />
    3224             <text key="name" text="Name" />
    3225             <text key="operator" text="Operator" />
     2980            <reference ref="name_operator" />
    32262981            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32272982            <space />
    3228             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3229             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3230             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3231             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     2983            <reference ref="internet_smoking_wheelchair" />
    32322984            <space />
    3233             <text key="phone" text="Phone Number" />
    3234             <text key="fax" text="Fax Number" />
    3235             <text key="website" text="Website" />
    3236             <text key="email" text="Email Address" />
     2985            <reference ref="contact" />
    32372986        </item>
    32382987        <item name="Hostel" icon="presets/hostel.png" type="node,closedway">
    32392988            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
    … … Note that for a match, at least one positive and no negative is required.  
    32452994            <label text="Edit Hostel" />
    32462995            <space />
    32472996            <key key="tourism" value="hostel" />
    3248             <text key="name" text="Name" />
    3249             <text key="operator" text="Operator" />
     2997            <reference ref="name_operator" />
    32502998            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32512999            <space />
    3252             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3253             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3254             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3255             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3000            <reference ref="internet_smoking_wheelchair" />
    32563001            <space />
    3257             <text key="phone" text="Phone Number" />
    3258             <text key="fax" text="Fax Number" />
    3259             <text key="website" text="Website" />
    3260             <text key="email" text="Email Address" />
     3002            <reference ref="contact" />
    32613003        </item>
    32623004        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway">
    32633005            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
    … … Note that for a match, at least one positive and no negative is required.  
    32693011            <label text="Edit Alpine Hut" />
    32703012            <space />
    32713013            <key key="tourism" value="alpine_hut" />
    3272             <text key="name" text="Name" />
    3273             <text key="operator" text="Operator" />
     3014            <reference ref="name_operator" />
    32743015            <text key="ele" text="Elevation" />
    32753016            <space />
    3276             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3277             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3278             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3279             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3017            <reference ref="internet_smoking_wheelchair" />
    32803018            <space />
    3281             <text key="phone" text="Phone Number" />
    3282             <text key="fax" text="Fax Number" />
    3283             <text key="website" text="Website" />
    3284             <text key="email" text="Email Address" />
     3019            <reference ref="contact" />
    32853020        </item>
    32863021        <separator/>
    32873022        <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    32923027            <label text="Edit Caravan Site" />
    32933028            <space />
    32943029            <key key="tourism" value="caravan_site" />
    3295             <text key="name" text="Name" />
    3296             <text key="operator" text="Operator" />
     3030            <reference ref="name_operator" />
    32973031            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    32983032            <space />
    3299             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3300             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3301             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3302             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3033            <reference ref="internet_smoking_wheelchair" />
    33033034            <space />
    33043035            <text key="capacity" text="Number of places" />
    33053036            <combo key="fee" text="Requires a fee" values="yes,no,interval" />
    3306             <check key="power_supply" text="Power supply" default="off" />
    3307             <check key="tents" text="Tents allowed" default="off" />
     3037            <check key="power_supply" text="Power supply" />
     3038            <check key="tents" text="Tents allowed" />
    33083039            <space />
    3309             <text key="phone" text="Phone Number" />
    3310             <text key="fax" text="Fax Number" />
    3311             <text key="website" text="Website" />
    3312             <text key="email" text="Email Address" />
     3040            <reference ref="contact" />
    33133041        </item>
    33143042        <item name="Camping Site" icon="presets/tent.png" type="node,closedway">
    33153043            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
    … … Note that for a match, at least one positive and no negative is required.  
    33233051            <label text="Edit Camping Site" />
    33243052            <space />
    33253053            <key key="tourism" value="camp_site" />
    3326             <text key="name" text="Name" />
    3327             <text key="operator" text="Operator" />
     3054            <reference ref="name_operator" />
    33283055            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    33293056            <space />
    3330             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3331             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3332             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3333             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3057            <reference ref="internet_smoking_wheelchair" />
    33343058            <space />
    3335             <text key="phone" text="Phone Number" />
    3336             <text key="fax" text="Fax Number" />
    3337             <text key="website" text="Website" />
    3338             <text key="email" text="Email Address" />
     3059            <reference ref="contact" />
    33393060        </item>
    33403061    </group> <!-- Accomodation -->
    33413062    <group name="Food+Drinks" icon="presets/restaurant.png">
    … … Note that for a match, at least one positive and no negative is required.  
    33503071            <label text="Edit Restaurant" />
    33513072            <space />
    33523073            <key key="amenity" value="restaurant" />
    3353             <text key="name" text="Name" />
    3354             <text key="operator" text="Operator" />
     3074            <reference ref="name_operator" />
    33553075            <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
    3356             <check key="microbrewery" text="Microbrewery" default="off" />
    3357             <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" />
     3076            <check key="microbrewery" text="Microbrewery" />
     3077            <reference ref="oh" />
    33583078            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    33593079            <space />
    3360             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3361             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3362             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3363             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3080            <reference ref="internet_smoking_wheelchair" />
    33643081            <space />
    3365             <text key="phone" text="Phone Number" />
    3366             <text key="fax" text="Fax Number" />
    3367             <text key="website" text="Website" />
    3368             <text key="email" text="Email Address" />
     3082            <reference ref="contact" />
    33693083        </item>
    33703084        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway">
    33713085            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
    … … Note that for a match, at least one positive and no negative is required.  
    33763090            <label text="Edit Fast Food Restaurant" />
    33773091            <space />
    33783092            <key key="amenity" value="fast_food" />
    3379             <text key="name" text="Name" />
    3380             <text key="operator" text="Operator" />
     3093            <reference ref="name_operator" />
    33813094            <combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebab,turkish,asian,thai,mexican,japanese,french,sandwich,sushi,fish_and_chips,chicken" />
    3382             <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" />
     3095            <reference ref="oh" />
    33833096            <space />
    3384             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3385             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3386             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3387             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3097            <reference ref="internet_smoking_wheelchair" />
    33883098            <space />
    3389             <text key="phone" text="Phone Number" />
    3390             <text key="fax" text="Fax Number" />
    3391             <text key="website" text="Website" />
    3392             <text key="email" text="Email Address" />
     3099            <reference ref="contact" />
    33933100        </item>
    33943101        <item name="Food Court" icon="presets/fastfood.png" type="node,closedway">
    33953102            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
    … … Note that for a match, at least one positive and no negative is required.  
    33993106            <label text="Edit Food Court" />
    34003107            <space />
    34013108            <key key="amenity" value="food_court" />
    3402             <text key="name" text="Name" />
    3403             <text key="operator" text="Operator" />
    3404             <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" />
     3109            <reference ref="name_operator_oh" />
    34053110            <space />
    3406             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3407             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3408             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3409             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3111            <reference ref="internet_smoking_wheelchair" />
    34103112            <space />
    3411             <text key="phone" text="Phone Number" />
    3412             <text key="fax" text="Fax Number" />
    3413             <text key="website" text="Website" />
    3414             <text key="email" text="Email Address" />
     3113            <reference ref="contact" />
    34153114        </item>
    34163115        <item name="Cafe" icon="presets/cafe.png" type="node,closedway">
    34173116            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
    … … Note that for a match, at least one positive and no negative is required.  
    34263125            <label text="Edit Cafe" />
    34273126            <space />
    34283127            <key key="amenity" value="cafe" />
    3429             <text key="name" text="Name" />
    3430             <text key="operator" text="Operator" />
     3128            <reference ref="name_operator" />
    34313129            <combo key="cuisine" text="Cuisine" values="ice_cream" />
    3432             <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" />
     3130            <reference ref="oh" />
    34333131            <space />
    3434             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3435             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3436             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3437             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3132            <reference ref="internet_smoking_wheelchair" />
    34383133            <space />
    3439             <text key="phone" text="Phone Number" />
    3440             <text key="fax" text="Fax Number" />
    3441             <text key="website" text="Website" />
    3442             <text key="email" text="Email Address" />
     3134            <reference ref="contact" />
    34433135        </item>
    34443136        <item name="Pub" icon="presets/pub.png" type="node,closedway">
    34453137            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
    … … Note that for a match, at least one positive and no negative is required.  
    34503142            <label text="Edit Pub" />
    34513143            <space />
    34523144            <key key="amenity" value="pub" />
    3453             <text key="name" text="Name" />
    3454             <text key="operator" text="Operator" />
    3455             <check key="microbrewery" text="Microbrewery" default="off" />
    3456             <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" />
     3145            <reference ref="name_operator" />
     3146            <check key="microbrewery" text="Microbrewery" />
     3147            <reference ref="oh" />
    34573148            <space />
    3458             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3459             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3460             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3461             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3149            <reference ref="internet_smoking_wheelchair" />
    34623150            <space />
    3463             <text key="phone" text="Phone Number" />
    3464             <text key="fax" text="Fax Number" />
    3465             <text key="website" text="Website" />
    3466             <text key="email" text="Email Address" />
     3151            <reference ref="contact" />
    34673152        </item>
    34683153        <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway">
    34693154            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
    … … Note that for a match, at least one positive and no negative is required.  
    34743159            <label text="Edit Biergarten" />
    34753160            <space />
    34763161            <key key="amenity" value="biergarten" />
    3477             <text key="name" text="Name" />
    3478             <text key="operator" text="Operator" />
    3479             <check key="microbrewery" text="Microbrewery" default="off" />
    3480             <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" />
     3162            <reference ref="name_operator" />
     3163            <check key="microbrewery" text="Microbrewery" />
     3164            <reference ref="oh" />
    34813165            <space />
    3482             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3483             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3484             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3485             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3166            <reference ref="internet_smoking_wheelchair" />
    34863167            <space />
    3487             <text key="phone" text="Phone Number" />
    3488             <text key="fax" text="Fax Number" />
    3489             <text key="website" text="Website" />
    3490             <text key="email" text="Email Address" />
     3168            <reference ref="contact" />
    34913169        </item>
    34923170        <item name="Bar" icon="presets/bar.png" type="node,closedway">
    34933171            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
    … … Note that for a match, at least one positive and no negative is required.  
    35013179            <label text="Edit Bar" />
    35023180            <space />
    35033181            <key key="amenity" value="bar" />
    3504             <text key="name" text="Name" />
    3505             <text key="operator" text="Operator" />
    3506             <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" />
     3182            <reference ref="name_operator_oh" />
    35073183            <space />
    3508             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3509             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3510             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3511             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3184            <reference ref="internet_smoking_wheelchair" />
    35123185            <space />
    3513             <text key="phone" text="Phone Number" />
    3514             <text key="fax" text="Fax Number" />
    3515             <text key="website" text="Website" />
    3516             <text key="email" text="Email Address" />
     3186            <reference ref="contact" />
    35173187        </item>
    35183188        <item name="Nightclub" icon="presets/bar.png" type="node,closedway">
    35193189            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
    … … Note that for a match, at least one positive and no negative is required.  
    35283198            <label text="Edit Nightclub" />
    35293199            <space />
    35303200            <key key="amenity" value="nightclub" />
    3531             <text key="name" text="Name" />
    3532             <text key="operator" text="Operator" />
    3533             <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" />
     3201            <reference ref="name_operator_oh" />
    35343202            <space />
    35353203            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    35363204            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    35373205            <space />
    3538             <text key="phone" text="Phone Number" />
    3539             <text key="fax" text="Fax Number" />
    3540             <text key="website" text="Website" />
    3541             <text key="email" text="Email Address" />
     3206            <reference ref="contact" />
    35423207        </item>
    35433208        <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
    35443209            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
    … … Note that for a match, at least one positive and no negative is required.  
    35493214            <label text="Edit Stripclub" />
    35503215            <space />
    35513216            <key key="amenity" value="stripclub" />
    3552             <text key="name" text="Name" />
    3553             <text key="operator" text="Operator" />
    3554             <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" />
     3217            <reference ref="name_operator_oh" />
    35553218            <space />
    3556             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    3557             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    3558             <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    3559             <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     3219            <reference ref="internet_smoking_wheelchair" />
    35603220            <space />
    3561             <text key="phone" text="Phone Number" />
    3562             <text key="fax" text="Fax Number" />
    3563             <text key="website" text="Website" />
    3564             <text key="email" text="Email Address" />
     3221            <reference ref="contact" />
    35653222        </item>
    35663223    </group> <!-- Food+Drinks -->
    35673224    <group name="Tourism" icon="presets/sightseeing.png">
    … … Note that for a match, at least one positive and no negative is required.  
    35693226            <label text="Edit Attraction" />
    35703227            <space />
    35713228            <key key="tourism" value="attraction" />
    3572             <text key="name" text="Name" />
    3573             <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" />
     3229            <reference ref="name_oh" />
    35743230        </item>
    35753231        <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
    35763232            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
    … … Note that for a match, at least one positive and no negative is required.  
    35843240            <space />
    35853241            <key key="tourism" value="viewpoint" />
    35863242            <text key="name" text="Name" />
    3587 <!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" />-->
     3243<!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
    35883244        </item>
    35893245        <separator/>
    35903246        <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    35983254            <space />
    35993255            <key key="tourism" value="information" />
    36003256            <key key="information" value="office" />
    3601             <text key="name" text="Name" />
    3602             <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" />
     3257            <reference ref="name_oh" />
    36033258            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
    36043259            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
    36053260        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    36143269            <combo key="map_size" text="Shown Area" values="site,city,region" />
    36153270            <text key="description" text="Closer Description" />
    36163271            <optional text="Routes shown for:">
    3617                 <check key="hiking" text="Hiking" default="off" />
    3618                 <check key="bicycle" text="Cycling" default="off" />
    3619                 <check key="mtb" text="Mountainbiking" default="off" />
    3620                 <check key="ski" text="Skiing" default="off" />
    3621                 <check key="horse" text="Riding" default="off" />
     3272                <check key="hiking" text="Hiking" />
     3273                <check key="bicycle" text="Cycling" />
     3274                <check key="mtb" text="Mountainbiking" />
     3275                <check key="ski" text="Skiing" />
     3276                <check key="horse" text="Riding" />
    36223277                <space />
    36233278                <label text="... other transportation modes possible" />
    36243279            </optional>
    … … Note that for a match, at least one positive and no negative is required.  
    36473302            <text key="name" text="Name" />
    36483303            <text key="ele" text="Elevation" />
    36493304            <optional text="Routes shown for:">
    3650                 <check key="hiking" text="Hiking" default="off" />
    3651                 <check key="bicycle" text="Cycling" default="off" />
    3652                 <check key="mtb" text="Mountainbiking" default="off" />
    3653                 <check key="ski" text="Skiing" default="off" />
    3654                 <check key="horse" text="Riding" default="off" />
     3305                <check key="hiking" text="Hiking" />
     3306                <check key="bicycle" text="Cycling" />
     3307                <check key="mtb" text="Mountainbiking" />
     3308                <check key="ski" text="Skiing" />
     3309                <check key="horse" text="Riding" />
    36553310                <space />
    36563311                <label text="... other transportation modes possible" />
    36573312            </optional>
    … … Note that for a match, at least one positive and no negative is required.  
    37103365            <label text="Edit Cinema" />
    37113366            <space />
    37123367            <key key="amenity" value="cinema" />
    3713             <text key="name" text="Name" />
    3714             <text key="operator" text="Operator" />           
    3715             <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" />
     3368            <reference ref="name_operator_oh" />
    37163369        </item>
    37173370        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
    37183371            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
    … … Note that for a match, at least one positive and no negative is required.  
    37223375            <label text="Edit Zoo" />
    37233376            <space />
    37243377            <key key="tourism" value="zoo" />
    3725             <text key="name" text="Name" />
    3726             <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" />
     3378            <reference ref="name_oh" />
    37273379            <text key="wikipedia" text="Wikipedia" />
    37283380            <space />
    3729             <text key="phone" text="Phone Number" />
    3730             <text key="fax" text="Fax Number" />
    3731             <text key="website" text="Website" />
    3732             <text key="email" text="Email Address" />
     3381            <reference ref="contact" />
    37333382        </item>
    37343383        <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway">
    37353384            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
    … … Note that for a match, at least one positive and no negative is required.  
    37453394            <space />
    37463395            <key key="leisure" value="dog_park" />
    37473396            <text key="name" text="Name" />
    3748             <check key="area" text="Area" default="off" />
    3749             <combo key="barrier" text="Barrier" values="fence,wall" /> 
    3750             <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" />
    3751             <check key="lit" text="Lit" default="off" />
    3752         </item> 
     3397            <check key="area" text="Area" />
     3398            <combo key="barrier" text="Barrier" values="fence,wall" />
     3399            <reference ref="oh" />
     3400            <check key="lit" text="Lit" />
     3401        </item>
    37533402        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
    37543403            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
    37553404                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
    … … Note that for a match, at least one positive and no negative is required.  
    37583407            <label text="Edit Theme Park" />
    37593408            <space />
    37603409            <key key="tourism" value="theme_park" />
    3761             <text key="name" text="Name" />
    3762             <text key="operator" text="Operator" />           
    3763             <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" />
     3410            <reference ref="name_operator_oh" />
    37643411            <space />
    3765             <text key="phone" text="Phone Number" />
    3766             <text key="fax" text="Fax Number" />
    3767             <text key="website" text="Website" />
    3768             <text key="email" text="Email Address" />
     3412            <reference ref="contact" />
    37693413        </item>
    37703414        <item name="Water Park" icon="presets/swimming.png" type="node,closedway">
    37713415            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
    … … Note that for a match, at least one positive and no negative is required.  
    37783422            <label text="Edit Water Park" />
    37793423            <space />
    37803424            <key key="leisure" value="water_park" />
    3781             <text key="name" text="Name" />
    3782             <text key="operator" text="Operator" />           
    3783             <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" />
     3425            <reference ref="name_operator_oh" />
    37843426            <space />
    3785             <text key="phone" text="Phone Number" />
    3786             <text key="fax" text="Fax Number" />
    3787             <text key="website" text="Website" />
    3788             <text key="email" text="Email Address" />
     3427            <reference ref="contact" />
    37893428        </item>
    37903429        <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
    37913430            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
    … … Note that for a match, at least one positive and no negative is required.  
    37953434            <label text="Edit Sauna" />
    37963435            <space />
    37973436            <key key="leisure" value="sauna" />
    3798             <text key="name" text="Name" />           
    3799             <text key="operator" text="Operator" />           
    3800             <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" />
    3801             <combo key="access" text="Access" values="yes,permissive,private,unknown" />                                           
     3437            <text key="name" text="Name" />
     3438            <text key="operator" text="Operator" />
     3439            <reference ref="oh" />
     3440            <combo key="access" text="Access" values="yes,permissive,private,unknown" />
    38023441            <space />
    3803             <text key="phone" text="Phone Number" />
    3804             <text key="fax" text="Fax Number" />
    3805             <text key="website" text="Website" />
    3806             <text key="email" text="Email Address" />
     3442            <reference ref="contact" />
    38073443        </item>
    38083444        <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway">
    38093445            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
    38103446            <label text="Edit Horse riding" />
    38113447            <space />
    38123448            <key key="leisure" value="horse_riding" />
    3813             <text key="name" text="Name" />
    3814             <text key="operator" text="Operator" />
    3815             <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" />
     3449            <reference ref="name_operator_oh" />
    38163450            <text key="fee" text="Fee" />
    38173451            <space />
    3818             <text key="phone" text="Phone Number" />
    3819             <text key="fax" text="Fax Number" />
    3820             <text key="website" text="Website" />
    3821             <text key="email" text="Email Address" />
     3452            <reference ref="contact" />
    38223453        </item>
    38233454        <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway">
    38243455            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
    … … Note that for a match, at least one positive and no negative is required.  
    38313462            <label text="Edit Brothel" />
    38323463            <space />
    38333464            <key key="amenity" value="brothel" />
    3834             <text key="name" text="Name" />
    3835             <text key="operator" text="Operator" />
    3836             <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" />
     3465            <reference ref="name_operator_oh" />
    38373466            <space />
    38383467            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
    38393468            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
    38403469            <space />
    3841             <text key="phone" text="Phone Number" />
    3842             <text key="fax" text="Fax Number" />
    3843             <text key="website" text="Website" />
    3844             <text key="email" text="Email Address" />
    3845         </item>
     3470            <reference ref="contact" />
     3471        </item>
    38463472        <separator/>
    38473473        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
    38483474            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"
    … … Note that for a match, at least one positive and no negative is required.  
    38643490            <space />
    38653491            <key key="tourism" value="picnic_site" />
    38663492            <text key="name" text="Name" />
    3867             <check key="fireplace" text="Fireplace" default="off" />
     3493            <check key="fireplace" text="Fireplace" />
    38683494        </item>
    38693495        <item name="Public Grill" icon="presets/bbq.png" type="node">
    38703496            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
    … … Note that for a match, at least one positive and no negative is required.  
    38733499                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=bbq"
    38743500                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
    38753501            <label text="Edit Public Grill" />
    3876             <space />           
     3502            <space />
    38773503            <key key="amenity" value="bbq" />
    38783504            <text key="name" text="Name" />
    3879             <combo key="covered" text="Covered" values="yes,no" />                               
    3880             <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />                               
     3505            <combo key="covered" text="Covered" values="yes,no" />
     3506            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
    38813507        </item>
    38823508        <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
    38833509            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
    … … Note that for a match, at least one positive and no negative is required.  
    39043530            <label text="Edit Museum" />
    39053531            <space />
    39063532            <key key="tourism" value="museum" />
    3907             <text key="name" text="Name" />
    3908             <text key="operator" text="Operator" />
    3909             <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" />
     3533            <reference ref="name_operator_oh" />
    39103534            <text key="wikipedia" text="Wikipedia" />
    39113535        </item>
    39123536        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
    … … Note that for a match, at least one positive and no negative is required.  
    39183542            <label text="Edit Theatre" />
    39193543            <space />
    39203544            <key key="amenity" value="theatre" />
    3921             <text key="name" text="Name" />
    3922             <text key="operator" text="Operator" />
     3545            <reference ref="name_operator" />
    39233546        </item>
    39243547        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
    39253548            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
    … … Note that for a match, at least one positive and no negative is required.  
    39333556            <label text="Edit Library" />
    39343557            <space />
    39353558            <key key="amenity" value="library" />
    3936             <text key="name" text="Name" />
    3937             <text key="operator" text="Operator" />
    3938             <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" />
     3559            <reference ref="name_operator_oh" />
    39393560        </item>
    39403561        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
    39413562            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
    … … Note that for a match, at least one positive and no negative is required.  
    39673588                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=studio"
    39683589                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=studio" />
    39693590            <label text="Edit Studio" />
    3970             <space />           
     3591            <space />
    39713592            <key key="amenity" value="studio" />
    3972             <text key="name" text="Name" />
    3973             <text key="operator" text="Operator" />           
     3593            <reference ref="name_operator" />
    39743594            <combo key="type" text="Type" values="audio,video" />
    39753595            <text key="phone" text="Phone Number" />
    3976             <text key="website" text="Website" />                         
     3596            <text key="website" text="Website" />
    39773597        </item>
    39783598    </group> <!-- Culture -->
    39793599    <group name="Place of Worship" icon="styles/standard/religion.png">
    … … Note that for a match, at least one positive and no negative is required.  
    39993619            <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
    40003620            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" values_searchable="true" />
    40013621            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9: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" />
    4002             <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" />
     3622            <reference ref="oh" />
    40033623        </item>
    40043624        <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation">
    40053625            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    … … Note that for a match, at least one positive and no negative is required.  
    40233643            <combo key="building" text="Building type" values="mosque" values_searchable="true" />
    40243644            <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
    40253645            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9: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" />
    4026             <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" />
     3646            <reference ref="oh" />
    40273647        </item>
    40283648        <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation">
    40293649            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    … … Note that for a match, at least one positive and no negative is required.  
    40473667            <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
    40483668            <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_searchable="true" />
    40493669            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9: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" />
    4050             <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" />
     3670            <reference ref="oh" />
    40513671        </item>
    40523672        <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation">
    40533673            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    … … Note that for a match, at least one positive and no negative is required.  
    40703690            <text key="name" text="Name" />
    40713691            <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
    40723692            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9: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" />
    4073             <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" />
     3693            <reference ref="oh" />
    40743694        </item>
    40753695        <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation">
    40763696            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    … … Note that for a match, at least one positive and no negative is required.  
    40933713            <text key="name" text="Name" />
    40943714            <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    40953715            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9: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" />
    4096             <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" />
     3716            <reference ref="oh" />
    40973717        </item>
    40983718        <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation">
    40993719            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    … … Note that for a match, at least one positive and no negative is required.  
    41153735            <key key="religion" value="shinto" />
    41163736            <text key="name" text="Name" />
    41173737            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9: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" />
    4118             <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" />
     3738            <reference ref="oh" />
    41193739        </item>
    41203740        <item name="Other Place of Worship" type="node,closedway,relation">
    41213741            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    … … Note that for a match, at least one positive and no negative is required.  
    41373757            <text key="name" text="Name" />
    41383758            <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
    41393759            <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 9:30,11:00|Sa,Su,PH 9: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" />
    4140             <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" />
     3760            <reference ref="oh" />
    41413761        </item>
    41423762    </group> <!-- Place of Worship -->
    41433763    <group name="Public Building" icon="presets/townhall.png">
    … … Note that for a match, at least one positive and no negative is required.  
    41723792                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=community_centre"
    41733793                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=community_centre" />
    41743794            <label text="Community Centre" />
    4175             <space />           
     3795            <space />
    41763796            <key key="amenity" value="community_centre" />
    4177             <text key="name" text="Name" />
    4178             <text key="operator" text="Operator" />
    4179             <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" />
     3797            <reference ref="name_operator" />
     3798            <reference ref="oh" />
    41803799        </item>
    41813800        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation">
    41823801            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
    … … Note that for a match, at least one positive and no negative is required.  
    42523871            <label text="Edit Post Office" />
    42533872            <space />
    42543873            <key key="amenity" value="post_office" />
    4255             <text key="name" text="Name" />
    4256             <text key="operator" text="Operator" />
     3874            <reference ref="name_operator" />
    42573875        </item>
    42583876    </group> <!-- Public Buildings -->
    42593877    <group name="Education" icon="presets/school.png">
    … … Note that for a match, at least one positive and no negative is required.  
    43113929            <label text="Edit Driving School" />
    43123930            <space />
    43133931            <key key="amenity" value="driving_school" />
    4314             <text key="name" text="Name" />
    4315             <text key="operator" text="Operator" />
     3932            <reference ref="name_operator" />
    43163933            <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
    43173934        </item>
    43183935    </group> <!-- Education -->
    … … Note that for a match, at least one positive and no negative is required.  
    43293946            <label text="Edit Hospital" />
    43303947            <space />
    43313948            <key key="amenity" value="hospital" />
    4332             <text key="name" text="Name" />
    4333             <text key="operator" text="Operator" />
     3949            <reference ref="name_operator" />
    43343950        </item>
    43353951        <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway">
    43363952            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
    … … Note that for a match, at least one positive and no negative is required.  
    43483964            <label text="Edit Doctors" />
    43493965            <space />
    43503966            <key key="amenity" value="doctors" />
    4351             <text key="name" text="Name" />
    4352             <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" />
     3967            <reference ref="name_oh" />
    43533968        </item>
    43543969        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
    43553970            <label text="Edit Dentist" />
    43563971            <space />
    43573972            <key key="amenity" value="dentist" />
    4358             <text key="name" text="Name" />
    4359             <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" />
     3973            <reference ref="name_oh" />
    43603974        </item>
    43613975        <item name="Nursing Home" type="node,closedway">
    43623976            <label text="Edit Nursing Home" />
    43633977            <space />
    43643978            <key key="amenity" value="nursing_home" />
    4365             <text key="name" text="Name" />
    4366             <text key="operator" text="Operator" />
     3979            <reference ref="name_operator" />
    43673980        </item>
    43683981        <item name="Retirement Home" type="node,closedway">
    43693982            <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
    … … Note that for a match, at least one positive and no negative is required.  
    43763989            <key key="amenity" value="social_facility" />
    43773990            <key key="social_facility" value="group_home" />
    43783991            <key key="social_facility:for" value="senior" />
    4379             <text key="name" text="Name" />
    4380             <text key="operator" text="Operator" />
     3992            <reference ref="name_operator" />
    43813993            <text key="capacity" text="Capacity" />
    43823994        </item>
    43833995        <separator/>
    … … Note that for a match, at least one positive and no negative is required.  
    43954007            <key key="amenity" value="pharmacy" />
    43964008            <text key="name" text="Name" />
    43974009            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
    4398             <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" />
     4010            <reference ref="oh" />
    43994011        </item>
    44004012        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
    44014013            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
    … … Note that for a match, at least one positive and no negative is required.  
    44044016            <label text="Edit Hearing Aids" />
    44054017            <space />
    44064018            <key key="shop" value="hearing_aids" />
    4407             <text key="name" text="Name" />
    4408             <text key="operator" text="Operator" />
    4409             <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" />
     4019            <reference ref="name_operator_oh" />
    44104020        </item>
    44114021        <separator/>
    44124022        <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    44244034            <space />
    44254035            <key key="amenity" value="baby_hatch" />
    44264036            <text key="operator" text="Operator" />
    4427             <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" />
     4037            <reference ref="oh" />
    44284038        </item>
    44294039        <separator/>
    44304040        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    44574067            <label text="Edit Veterinary" />
    44584068            <space />
    44594069            <key key="amenity" value="veterinary" />
    4460             <text key="name" text="Name" />
    4461             <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" />
     4070            <reference ref="name_oh" />
    44624071        </item>
    44634072    </group> <!-- Health -->
    44644073    <group name="Facilities" icon="presets/telephone.png">
    … … Note that for a match, at least one positive and no negative is required.  
    45124121            <space />
    45134122            <key key="amenity" value="telephone" />
    45144123            <text key="operator" text="Operator" />
    4515             <check key="payment:coins" text="Coins" default="off" />
    4516             <check key="payment:notes" text="Notes" default="off" />
    4517             <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
    4518             <check key="payment:debit_cards" text="Debit cards" default="off" />
    4519             <check key="payment:credit_cards" text="Credit cards" default="off" />
    4520             <check key="payment:telephone_cards" text="Telephone cards" default="off" />
     4124            <check key="payment:coins" text="Coins" />
     4125            <check key="payment:notes" text="Notes" />
     4126            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
     4127            <check key="payment:debit_cards" text="Debit cards" />
     4128            <check key="payment:credit_cards" text="Credit cards" />
     4129            <check key="payment:telephone_cards" text="Telephone cards" />
    45214130        </item>
    45224131        <item name="Emergency Phone" icon="presets/telephone.png" type="node">
    45234132            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
    … … Note that for a match, at least one positive and no negative is required.  
    45274136            <key key="emergency" value="phone" />
    45284137        </item>
    45294138        <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation">
    4530             <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access" 
     4139            <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
    45314140                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
    45324141                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:internet_access"
    45334142                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:internet_access"
    … … Note that for a match, at least one positive and no negative is required.  
    45474156            <space />
    45484157            <key key="emergency" value="aed" />
    45494158            <combo key="opening_hours" text="Opening Hours" values="24/7,limited" />
    4550             <text  key="operator" text="Operator" /> 
    4551             <check key="indoor" text="Located inside a building?" default="off" />
     4159            <text  key="operator" text="Operator" />
     4160            <check key="indoor" text="Located inside a building?" />
    45524161            <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
    45534162            <optional>
    45544163                <text key="lastcheck"      text="Last check date (YYYY-MM-DD)" />
    … … Note that for a match, at least one positive and no negative is required.  
    45684177                <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" />
    45694178                <combo key="support" text="Support" values="pole,wall_mounted,billboard,ground" values_context="mounting/support" />
    45704179                <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)" />
    4571                 <check key="date" text="Shows current date" default="off" />
    4572                 <check key="thermometer" text="Shows temperature" default="off" />
    4573                 <check key="barometer" text="Shows barometric pressure" default="off" />
    4574                 <check key="hygrometer" text="Shows humidity" default="off" />
     4180                <check key="date" text="Shows current date" />
     4181                <check key="thermometer" text="Shows temperature" />
     4182                <check key="barometer" text="Shows barometric pressure" />
     4183                <check key="hygrometer" text="Shows humidity" />
    45754184            </optional>
    45764185        </item>
    45774186        <item name="Recycling" icon="presets/recycling.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    45884197            <label text="Edit Recycling Station" />
    45894198            <space />
    45904199            <key key="amenity" value="recycling" />
    4591             <check key="recycling:batteries" text="Batteries" default="off" />
    4592             <check key="recycling:cans" text="Cans" default="off" />
    4593             <check key="recycling:clothes" text="Clothes" default="off" />
    4594             <check key="recycling:glass" text="Glass" default="off" />
    4595             <check key="recycling:paper" text="Paper" default="off" />
    4596             <check key="recycling:scrap_metal" text="Scrap Metal" default="off" />
     4200            <check key="recycling:batteries" text="Batteries" />
     4201            <check key="recycling:cans" text="Cans" />
     4202            <check key="recycling:clothes" text="Clothes" />
     4203            <check key="recycling:glass" text="Glass" />
     4204            <check key="recycling:paper" text="Paper" />
     4205            <check key="recycling:scrap_metal" text="Scrap Metal" />
    45974206            <combo key="recycling_type" text="Type" values="container,centre" />
    45984207        </item>
    45994208        <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node">
    … … Note that for a match, at least one positive and no negative is required.  
    46424251            <space />
    46434252            <key key="amenity" value="shelter" />
    46444253            <text key="name" text="Name" />
    4645             <check key="fireplace" text="Fireplace" default="off" />
     4254            <check key="fireplace" text="Fireplace" />
    46464255            <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
    46474256        </item>
    46484257        <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
    … … Note that for a match, at least one positive and no negative is required.  
    46664275            <label text="Edit Source of Potable Water" />
    46674276            <space />
    46684277            <key key="amenity" value="drinking_water" />
    4669             <check key="indoor" text="Indoor" default="off" />
     4278            <check key="indoor" text="Indoor" />
    46704279            <optional>
    46714280                <text key="name" text="Name" />
    46724281                <text key="description" text="Description" />
    … … Note that for a match, at least one positive and no negative is required.  
    46864295            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" />
    46874296            <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
    46884297            <space />
    4689             <text key="name" text="Name" />
    4690             <text key="ref" text="Reference" />
     4298            <reference ref="name_ref" />
    46914299            <text key="operator" text="Operator" />
    46924300            <space />
    46934301            <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
    … … Note that for a match, at least one positive and no negative is required.  
    47384346            <label text="Edit Golf Course" />
    47394347            <space />
    47404348            <key key="leisure" value="golf_course" />
    4741             <text key="name" text="Name" />
    4742             <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" />
     4349            <reference ref="name_oh" />
    47434350        </item>
    47444351        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
    47454352            <label text="Edit Miniature Golf" />
    47464353            <space />
    47474354            <key key="leisure" value="miniature_golf" />
    4748             <text key="name" text="Name" />
    4749             <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" />
     4355            <reference ref="name_oh" />
    47504356        </item>
    47514357    </group> <!-- Sport facilities -->
    47524358    <group name="Sport" icon="presets/rowing.png">
    … … Note that for a match, at least one positive and no negative is required.  
    49084514            <label text="Edit Soccer" />
    49094515            <space />
    49104516            <key key="sport" value="soccer" />
    4911             <text key="name" text="Name" />
    4912             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4517            <reference ref="name_leisure_pitch" />
    49134518        </item>
    49144519        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
    49154520            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
    49164521            <label text="Edit Australian Football" />
    49174522            <space />
    49184523            <key key="sport" value="australian_football" />
    4919             <text key="name" text="Name" />
    4920             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4524            <reference ref="name_leisure_pitch" />
    49214525        </item>
    49224526        <item name="American Football" icon="presets/football.png" type="node,closedway">
    49234527            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
    49244528            <label text="Edit American Football" />
    49254529            <space />
    49264530            <key key="sport" value="american_football" />
    4927             <text key="name" text="Name" />
    4928             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4531            <reference ref="name_leisure_pitch" />
    49294532        </item>
    49304533        <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
    49314534            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
    49324535            <label text="Edit Canadian Football" />
    49334536            <space />
    49344537            <key key="sport" value="canadian_football" />
    4935             <text key="name" text="Name" />
    4936             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4538            <reference ref="name_leisure_pitch" />
    49374539        </item>
    49384540        <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway">
    49394541            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
    49404542            <label text="Edit Gaelic Games" />
    49414543            <space />
    49424544            <key key="sport" value="gaelic_games" />
    4943             <text key="name" text="Name" />
    4944             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4545            <reference ref="name_leisure_pitch" />
    49454546            <optional>
    49464547                <check key="gaelic_games:hurling" text="Hurling" />
    49474548                <check key="gaelic_games:football" text="Football" />
    … … Note that for a match, at least one positive and no negative is required.  
    49554556            <label text="Edit Rugby League" />
    49564557            <space />
    49574558            <key key="sport" value="rugby_league" />
    4958             <text key="name" text="Name" />
    4959             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4559            <reference ref="name_leisure_pitch" />
    49604560        </item>
    49614561        <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
    49624562            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
    … … Note that for a match, at least one positive and no negative is required.  
    49644564            <label text="Edit Rugby Union" />
    49654565            <space />
    49664566            <key key="sport" value="rugby_union" />
    4967             <text key="name" text="Name" />
    4968             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4567            <reference ref="name_leisure_pitch" />
    49694568        </item>
    49704569        <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
    49714570            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
    49724571            <label text="Edit Baseball" />
    49734572            <space />
    49744573            <key key="sport" value="baseball" />
    4975             <text key="name" text="Name" />
    4976             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4574            <reference ref="name_leisure_pitch" />
    49774575        </item>
    49784576        <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
    49794577            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
    49804578            <label text="Edit Basketball" />
    49814579            <space />
    49824580            <key key="sport" value="basketball" />
    4983             <text key="name" text="Name" />
    4984             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4581            <reference ref="name_leisure_pitch" />
    49854582        </item>
    49864583        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway">
    49874584            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
    49884585            <label text="Edit Volleyball" />
    4989             <space />           
     4586            <space />
    49904587            <key key="sport" value="volleyball" />
    4991             <text key="name" text="Name" />
    4992             <text key="operator" text="Operator" />
     4588            <reference ref="name_operator" />
    49934589            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    4994         </item> 
     4590        </item>
    49954591        <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway">
    49964592            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
    49974593            <label text="Edit Beachvolleyball" />
    4998             <space />           
     4594            <space />
    49994595            <key key="sport" value="beachvolleyball" />
    5000             <text key="name" text="Name" />
    5001             <text key="operator" text="Operator" />
     4596            <reference ref="name_operator" />
    50024597            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    5003         </item> 
     4598        </item>
    50044599        <item name="Golf" icon="presets/golf.png" type="node,closedway">
    50054600            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
    50064601                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
    … … Note that for a match, at least one positive and no negative is required.  
    50174612            <label text="Edit Boule" />
    50184613            <space />
    50194614            <key key="sport" value="boules" />
    5020             <text key="name" text="Name" />
    5021             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4615            <reference ref="name_leisure_pitch" />
    50224616        </item>
    50234617        <item name="Bowls" icon="presets/boule.png" type="node,closedway">
    50244618            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
    50254619            <label text="Edit Bowls" />
    50264620            <space />
    50274621            <key key="sport" value="bowls" />
    5028             <text key="name" text="Name" />
    5029             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4622            <reference ref="name_leisure_pitch" />
    50304623        </item>
    50314624        <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
    50324625            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
    50334626            <label text="Edit Cricket" />
    50344627            <space />
    50354628            <key key="sport" value="cricket" />
    5036             <text key="name" text="Name" />
    5037             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4629            <reference ref="name_leisure_pitch" />
    50384630        </item>
    50394631        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
    50404632            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
    … … Note that for a match, at least one positive and no negative is required.  
    50494641            <label text="Edit Croquet" />
    50504642            <space />
    50514643            <key key="sport" value="croquet" />
    5052             <text key="name" text="Name" />
    5053             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4644            <reference ref="name_leisure_pitch" />
    50544645        </item>
    50554646        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
    50564647            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
    … … Note that for a match, at least one positive and no negative is required.  
    50664657            <label text="Edit Pelota" />
    50674658            <space />
    50684659            <key key="sport" value="pelota" />
    5069             <text key="name" text="Name" />
    5070             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4660            <reference ref="name_leisure_pitch" />
    50714661        </item>
    50724662        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
    50734663            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
    … … Note that for a match, at least one positive and no negative is required.  
    50914681            <label text="Edit Tennis" />
    50924682            <space />
    50934683            <key key="sport" value="tennis" />
    5094             <text key="name" text="Name" />
    5095             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
     4684            <reference ref="name_leisure_pitch" />
    50964685        </item>
    50974686    </group> <!-- Sport (Ball) -->
    50984687    <group name="Motorsport" icon="presets/motorbike.png">
    … … Note that for a match, at least one positive and no negative is required.  
    52154804        <item name="Chimney" icon="presets/chimney.png" type="node">
    52164805            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
    52174806            <label text="Edit Chimney" />
    5218             <space />           
     4807            <space />
    52194808            <key key="man_made" value="chimney" />
    5220             <text key="name" text="Name" />
    5221             <text key="operator" text="Operator" />           
    5222             <text key="height" text="Height (meters)" />           
     4809            <reference ref="name_operator" />
     4810            <text key="height" text="Height (meters)" />
    52234811        </item>
    52244812        <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
    52254813            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
    … … Note that for a match, at least one positive and no negative is required.  
    52724860            <text key="depth" text="Depth in meters" />
    52734861            <text key="operator" text="Operator" />
    52744862            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
    5275             <combo key="headframe" text="Visible Headframe" values="yes,no" /> 
    5276             <check key="disused" text="Disused" default="off" />                                                             
     4863            <combo key="headframe" text="Visible Headframe" values="yes,no" />
     4864            <check key="disused" text="Disused" />
    52774865        </item>
    52784866        <item name="Adit" icon="presets/adit.png" type="node">
    52794867            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
    … … Note that for a match, at least one positive and no negative is required.  
    52894877            <text key="length" text="Length in meters" />
    52904878            <text key="operator" text="Operator" />
    52914879            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
    5292             <check key="disused" text="Disused" default="off" />                                                             
     4880            <check key="disused" text="Disused" />
    52934881        </item>
    52944882        <separator/>
    52954883        <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    53054893                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=water_works"
    53064894                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_works" />
    53074895            <label text="Edit Water Works" />
    5308             <space />           
     4896            <space />
    53094897            <key key="man_made" value="water_works" />
    5310             <text key="name" text="Name" />
    5311             <text key="operator" text="Operator" />           
    5312         </item>             
     4898            <reference ref="name_operator" />
     4899        </item>
    53134900        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
    53144901            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
    53154902                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
    … … Note that for a match, at least one positive and no negative is required.  
    53304917                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=watermill"
    53314918                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
    53324919            <label text="Edit Watermill" />
    5333             <space />           
     4920            <space />
    53344921            <key key="man_made" value="watermill" />
    53354922            <text key="name" text="Name" />
    5336         </item>       
     4923        </item>
    53374924        <item name="Fountain" icon="presets/spring.png" type="node,closedway">
    53384925            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
    53394926                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
    … … Note that for a match, at least one positive and no negative is required.  
    53864973                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=street_lamp"
    53874974                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=street_lamp" />
    53884975            <label text="Edit Street Lamp" />
    5389             <space />           
     4976            <space />
    53904977            <key key="highway" value="street_lamp" />
    5391             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />                                                                                       
    5392         </item> 
     4978            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
     4979        </item>
    53934980        <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway">
    5394             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station" 
     4981            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
    53954982                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=monitoring_station"
    53964983                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=monitoring_station" />
    53974984            <label text="Edit Monitoring Station" />
    5398             <space />           
     4985            <space />
    53994986            <key key="man_made" value="monitoring_station" />
    5400             <text key="name" text="Name" />
    5401             <text key="operator" text="Operator" />             
     4987            <reference ref="name_operator" />
    54024988            <label text="Monitoring:" />
    54034989            <checkgroup columns="3">
    54044990                <check key="monitoring:weather" text="Weather" />
    … … Note that for a match, at least one positive and no negative is required.  
    54705056            <label text="Edit Power Plant" />
    54715057            <space />
    54725058            <key key="power" value="plant" />
    5473             <text key="name" text="Name" />
    5474             <text key="operator" text="Operator" />
     5059            <reference ref="name_operator" />
    54755060            <text key="ref" text="Reference" />
    54765061            <text key="start_date" text="Start date" />
    54775062            <optional>
    … … Note that for a match, at least one positive and no negative is required.  
    54995084            <label text="Edit Power Generator" />
    55005085            <space />
    55015086            <key key="power" value="generator" />
    5502             <text key="name" text="Name" />
    5503             <text key="operator" text="Operator" />
     5087            <reference ref="name_operator" />
    55045088            <text key="ref" text="Reference" />
    55055089            <text key="start_date" text="Start date" />
    55065090            <combo key="generator:source" text="Source" values_searchable="true">
    … … Note that for a match, at least one positive and no negative is required.  
    56775261            <label text="Edit Ruins" />
    56785262            <space />
    56795263            <key key="historic" value="ruins" />
    5680             <text key="name" text="Name" />
    5681             <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" />
     5264            <reference ref="name_oh" />
    56825265        </item>
    56835266        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
    56845267            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
    … … Note that for a match, at least one positive and no negative is required.  
    56895272            <label text="Edit Archaeological Site" />
    56905273            <space />
    56915274            <key key="historic" value="archaeological_site" />
    5692             <text key="name" text="Name" />
    5693             <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" />
     5275            <reference ref="name_oh" />
    56945276        </item>
    56955277        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
    56965278            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
    … … Note that for a match, at least one positive and no negative is required.  
    57635345            <label text="Edit Supermarket" />
    57645346            <space />
    57655347            <key key="shop" value="supermarket" />
    5766             <text key="name" text="Name" />
    5767             <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" />
     5348            <reference ref="name_oh" />
    57685349        </item>
    57695350        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway">
    57705351            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
    … … Note that for a match, at least one positive and no negative is required.  
    57755356            <label text="Edit Convenience Store" />
    57765357            <space />
    57775358            <key key="shop" value="convenience" />
    5778             <text key="name" text="Name" />
    5779             <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" />
     5359            <reference ref="name_oh" />
    57805360        </item>
    57815361        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway">
    57825362            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
    … … Note that for a match, at least one positive and no negative is required.  
    57885368            <label text="Edit Kiosk" />
    57895369            <space />
    57905370            <key key="shop" value="kiosk" />
    5791             <text key="name" text="Name" />
    5792             <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" />
     5371            <reference ref="name_oh" />
    57935372        </item>
    57945373        <separator/>
    57955374        <item name="Bakery" icon="presets/baker.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    58055384            <label text="Edit Bakery" />
    58065385            <space />
    58075386            <key key="shop" value="bakery" />
    5808             <text key="name" text="Name" />
    5809             <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" />
     5387            <reference ref="name_oh" />
    58105388        </item>
    58115389        <item name="Butcher" icon="presets/cow.png" type="node,closedway">
    58125390            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
    … … Note that for a match, at least one positive and no negative is required.  
    58195397            <label text="Edit Butcher" />
    58205398            <space />
    58215399            <key key="shop" value="butcher" />
    5822             <text key="name" text="Name" />
    5823             <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" />
     5400            <reference ref="name_oh" />
    58245401        </item>
    58255402        <item name="Seafood" icon="presets/seafood.png" type="node,closedway">
    58265403            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
    … … Note that for a match, at least one positive and no negative is required.  
    58285405                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=seafood"
    58295406                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=seafood" />
    58305407            <label text="Edit Seafood Shop" />
    5831             <space />           
     5408            <space />
    58325409            <key key="shop" value="seafood" />
    5833             <text key="name" text="Name" />
    5834             <text key="operator" text="Operator" />
    5835             <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" />
     5410            <reference ref="name_operator_oh" />
    58365411        </item>
    58375412        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway">
    58385413            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
    … … Note that for a match, at least one positive and no negative is required.  
    58445419            <label text="Edit Deli (Fine Food)" />
    58455420            <space />
    58465421            <key key="shop" value="deli" />
    5847             <text key="name" text="Name" />
    5848             <text key="operator" text="Operator" />
    5849             <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" />
    5850         </item>                     
     5422            <reference ref="name_operator_oh" />
     5423        </item>
    58515424        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
    58525425            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
    58535426                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=confectionery"
    … … Note that for a match, at least one positive and no negative is required.  
    58595432            <label text="Edit Confectionery" />
    58605433            <space />
    58615434            <key key="shop" value="confectionery" />
    5862             <text key="name" text="Name" />
    5863             <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" />
     5435            <reference ref="name_oh" />
    58645436        </item>
    58655437        <separator/>
    58665438        <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    58735445                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=marketplace"
    58745446                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=marketplace" />
    58755447            <label text="Edit Marketplace" />
    5876             <space />           
     5448            <space />
    58775449            <key key="amenity" value="marketplace" />
    5878             <text key="name" text="Name" />
    5879             <text key="operator" text="Operator" />
    5880             <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" />
     5450            <reference ref="name_operator_oh" />
    58815451            <text key="website" text="Website" />
    58825452            <combo key="organic" text="Organic" values="only,yes,no" />
    58835453        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    58885458                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=greengrocer"
    58895459                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=greengrocer" />
    58905460            <label text="Edit Greengrocer" />
    5891             <space />           
     5461            <space />
    58925462            <key key="shop" value="greengrocer" />
    5893             <text key="name" text="Name" />
    5894             <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" />
     5463            <reference ref="name_oh" />
    58955464            <text key="website" text="Website" />
    58965465            <combo key="organic" text="Organic" values="only,yes,no" />
    58975466        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    59035472            <label text="Edit Farm Stand" />
    59045473            <space />
    59055474            <key key="shop" value="farm" />
    5906             <text key="name" text="Name" />
     5475            <reference ref="name_oh" />
    59075476            <text key="description" text="Description" />
    5908             <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" />
    59095477            <text key="phone" text="Phone Number" match="key" />
    59105478            <text key="website" text="Website" />
    59115479            <combo key="organic" text="Organic" values="only,yes,no" />
    … … Note that for a match, at least one positive and no negative is required.  
    59355503            <label text="Edit Alcohol Shop" />
    59365504            <space />
    59375505            <key key="shop" value="alcohol" />
    5938             <text key="name" text="Name" />
    5939             <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" />
     5506            <reference ref="name_oh" />
    59405507        </item>
    59415508        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway">
    59425509            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
    … … Note that for a match, at least one positive and no negative is required.  
    59465513            <label text="Edit Beverages Shop" />
    59475514            <space />
    59485515            <key key="shop" value="beverages" />
    5949             <text key="name" text="Name" />
    5950             <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" />
     5516            <reference ref="name_oh" />
    59515517        </item>
    59525518    </group> <!-- Food -->
    59535519    <group name="Clothes" icon="styles/standard/shop/clothes.png">
    … … Note that for a match, at least one positive and no negative is required.  
    59615527            <label text="Edit Clothes Shop" />
    59625528            <space />
    59635529            <key key="shop" value="clothes" />
    5964             <text key="name" text="Name" />
    5965             <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" />
     5530            <reference ref="name_oh" />
    59665531            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    59675532            <combo key="organic" text="Organic" values="only,yes,no" />
    59685533        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    59755540            <label text="Edit Boutique" />
    59765541            <space />
    59775542            <key key="shop" value="boutique" />
    5978             <text key="name" text="Name" />
    5979             <text key="operator" text="Operator" />
    5980             <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" />
     5543            <reference ref="name_operator_oh" />
    59815544        </item>
    59825545        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
    59835546            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
    … … Note that for a match, at least one positive and no negative is required.  
    59875550            <label text="Edit Shoe Shop" />
    59885551            <space />
    59895552            <key key="shop" value="shoes" />
    5990             <text key="name" text="Name" />
    5991             <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" />
     5553            <reference ref="name_oh" />
    59925554            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    59935555            <combo key="organic" text="Organic" values="only,yes,no" />
    59945556        </item>
    … … Note that for a match, at least one positive and no negative is required.  
    60005562            <label text="Edit Outdoor Shop" />
    60015563            <space />
    60025564            <key key="shop" value="outdoor" />
    6003             <text key="name" text="Name" />
    6004             <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" />
     5565            <reference ref="name_oh" />
    60055566        </item>
    60065567        <item name="Sports" icon="presets/rowing.png" type="node,closedway">
    60075568             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
    … … Note that for a match, at least one positive and no negative is required.  
    60105571            <label text="Edit Sports Shop" />
    60115572            <space />
    60125573            <key key="shop" value="sports" />
    6013             <text key="name" text="Name" />
    6014             <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" />
     5574            <reference ref="name_oh" />
    60155575        </item>
    60165576        <separator/>
    60175577        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    60235583            <label text="Edit Dry Cleaning" />
    60245584            <space />
    60255585            <key key="shop" value="dry_cleaning" />
    6026             <text key="name" text="Name" />
    6027             <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" />
     5586            <reference ref="name_oh" />
    60285587        </item>
    60295588        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
    60305589            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
    … … Note that for a match, at least one positive and no negative is required.  
    60345593            <label text="Edit Laundry" />
    60355594            <space />
    60365595            <key key="shop" value="laundry" />
    6037             <text key="name" text="Name" />
    6038             <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" />
     5596            <reference ref="name_oh" />
    60395597        </item>
    60405598        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
    60415599            <label text="Edit Tailor" />
    60425600            <space />
    60435601            <key key="shop" value="tailor" />
    6044             <text key="name" text="Name" />
    6045             <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" />
     5602            <reference ref="name_oh" />
    60465603        </item>
    60475604        <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
    60485605            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
    … … Note that for a match, at least one positive and no negative is required.  
    60515608            <label text="Edit Fabric Shop" />
    60525609            <space />
    60535610            <key key="shop" value="fabric" />
    6054             <text key="name" text="Name" />
    6055             <text key="operator" text="Operator" />
    6056             <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" />
     5611            <reference ref="name_operator_oh" />
    60575612        </item>
    60585613    </group> <!-- Clothes -->
    60595614    <group name="Electronic" icon="styles/standard/shop/electronics.png">
    … … Note that for a match, at least one positive and no negative is required.  
    60655620            <label text="Edit Computer Shop" />
    60665621            <space />
    60675622            <key key="shop" value="computer" />
    6068             <text key="name" text="Name" />
    6069             <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" />
     5623            <reference ref="name_oh" />
    60705624        </item>
    60715625        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
    60725626            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
    … … Note that for a match, at least one positive and no negative is required.  
    60765630            <label text="Edit Electronics Shop" />
    60775631            <space />
    60785632            <key key="shop" value="electronics" />
    6079             <text key="name" text="Name" />
    6080             <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" />
     5633            <reference ref="name_oh" />
    60815634        </item>
    60825635        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
    60835636            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
    … … Note that for a match, at least one positive and no negative is required.  
    60865639            <label text="Edit Mobile Phone Shop" />
    60875640            <space />
    60885641            <key key="shop" value="mobile_phone" />
    6089             <text key="name" text="Name" />
    6090             <text key="operator" text="Operator" />
    6091             <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" />
     5642            <reference ref="name_operator_oh" />
    60925643        </item>
    60935644        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
    60945645            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
    … … Note that for a match, at least one positive and no negative is required.  
    60975648            <label text="Edit Vacuum Cleaner Shop" />
    60985649            <space />
    60995650            <key key="shop" value="vacuum_cleaner" />
    6100             <text key="name" text="Name" />
    6101             <text key="operator" text="Operator" />
    6102             <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" />
     5651            <reference ref="name_operator_oh" />
    61035652        </item>
    61045653        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
    61055654            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
    … … Note that for a match, at least one positive and no negative is required.  
    61095658            <label text="Edit Hifi Shop" />
    61105659            <space />
    61115660            <key key="shop" value="hifi" />
    6112             <text key="name" text="Name" />
    6113             <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" />
     5661            <reference ref="name_oh" />
    61145662        </item>
    61155663        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
    61165664            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
    … … Note that for a match, at least one positive and no negative is required.  
    61205668            <label text="Edit Video Shop" />
    61215669            <space />
    61225670            <key key="shop" value="video" />
    6123             <text key="name" text="Name" />
    6124             <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" />
     5671            <reference ref="name_oh" />
    61255672        </item>
    61265673    </group> <!-- Electronic -->
    61275674    <group name="Cash" icon="presets/dollar.png">
    … … Note that for a match, at least one positive and no negative is required.  
    61395686            <label text="Edit Bank" />
    61405687            <space />
    61415688            <key key="amenity" value="bank" />
    6142             <text key="name" text="Name" />
    6143             <text key="brand" text="Brand" />
    6144             <text key="operator" text="Operator" />
    6145             <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" />
     5689            <reference ref="name_brand_operator_oh" />
    61465690            <check key="atm" text="Automated Teller Machine" default="on" />
    61475691        </item>
    61485692        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    61555699            <label text="Edit Money Exchange" />
    61565700            <space />
    61575701            <key key="amenity" value="bureau_de_change" />
    6158             <text key="name" text="Name" />
    6159             <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" />
     5702            <reference ref="name_oh" />
    61605703        </item>
    61615704        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
    61625705            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
    … … Note that for a match, at least one positive and no negative is required.  
    61755718            <key key="amenity" value="atm" />
    61765719            <text key="brand" text="Brand" />
    61775720            <text key="operator" text="Operator" />
    6178             <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" />
     5721            <reference ref="oh" />
    61795722        </item>
    61805723        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway">
    61815724            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
    … … Note that for a match, at least one positive and no negative is required.  
    61845727            <label text="Edit Pawnbroker" />
    61855728            <space />
    61865729            <key key="shop" value="pawnbroker" />
    6187             <text key="name" text="Name" />
    6188             <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" />
     5730            <reference ref="name_oh" />
    61895731        </item>
    61905732    </group> <!-- Cash -->
    61915733    <group name="Other" icon="styles/standard/shop/mall.png">
    … … Note that for a match, at least one positive and no negative is required.  
    61985740            <label text="Edit Department Store" />
    61995741            <space />
    62005742            <key key="shop" value="department_store" />
    6201             <text key="name" text="Name" />
    6202             <text key="operator" text="Operator" />
    6203             <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" />
     5743            <reference ref="name_operator_oh" />
    62045744        </item>
    62055745        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
    62065746            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
    … … Note that for a match, at least one positive and no negative is required.  
    62105750            <label text="Edit Mall" />
    62115751            <space />
    62125752            <key key="shop" value="mall" />
    6213             <text key="name" text="Name" />
    6214             <text key="operator" text="Operator" />
    6215             <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" />
     5753            <reference ref="name_operator_oh" />
    62165754        </item>
    62175755        <separator/>
    62185756        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    62245762            <label text="Edit Chemist" />
    62255763            <space />
    62265764            <key key="shop" value="chemist" />
    6227             <text key="name" text="Name" />
    6228             <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" />
     5765            <reference ref="name_oh" />
    62295766        </item>
    62305767        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway">
    62315768            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
    … … Note that for a match, at least one positive and no negative is required.  
    62375774            <label text="Edit Hairdresser" />
    62385775            <space />
    62395776            <key key="shop" value="hairdresser" />
    6240             <text key="name" text="Name" />
    6241             <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" />
     5777            <reference ref="name_oh" />
    62425778        </item>
    62435779        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
    62445780            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
    … … Note that for a match, at least one positive and no negative is required.  
    62475783            <label text="Edit Optician" />
    62485784            <space />
    62495785            <key key="shop" value="optician" />
    6250             <text key="name" text="Name" />
    6251             <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" />
     5786            <reference ref="name_oh" />
    62525787        </item>
    62535788        <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
    62545789            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
    … … Note that for a match, at least one positive and no negative is required.  
    62575792            <label text="Edit Jewelry" />
    62585793            <space />
    62595794            <key key="shop" value="jewelry" />
    6260             <text key="name" text="Name" />
    6261             <text key="operator" text="Operator" />
    6262             <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" />
     5795            <reference ref="name_operator_oh" />
    62635796        </item>
    62645797        <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
    62655798            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
    … … Note that for a match, at least one positive and no negative is required.  
    62715804            <label text="Edit Gift Shop" />
    62725805            <space />
    62735806            <key key="shop" value="gift" />
    6274             <text key="name" text="Name" />
    6275             <text key="operator" text="Operator" />
    6276             <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" />
     5807            <reference ref="name_operator_oh" />
    62775808            <optional>
    62785809                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
    62795810                <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
    … … Note that for a match, at least one positive and no negative is required.  
    62865817            <label text="Edit Erotic Shop" />
    62875818            <space />
    62885819            <key key="shop" value="erotic" />
    6289             <text key="name" text="Name" />
    6290             <text key="operator" text="Operator" />
    6291             <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" />
     5820            <reference ref="name_operator_oh" />
    62925821        </item>
    62935822        <separator/>
    62945823        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    63015830            <label text="Edit Florist" />
    63025831            <space />
    63035832            <key key="shop" value="florist" />
    6304             <text key="name" text="Name" />
    6305             <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" />
     5833            <reference ref="name_oh" />
    63065834        </item>
    63075835        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway">
    63085836            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
    … … Note that for a match, at least one positive and no negative is required.  
    63155843            <label text="Edit Garden Centre" />
    63165844            <space />
    63175845            <key key="shop" value="garden_centre" />
    6318             <text key="name" text="Name" />
    6319             <text key="brand" text="Brand" />
    6320             <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" />
     5846            <reference ref="name_brand_oh" />
    63215847        </item>
    63225848        <separator/>
    63235849        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    63305856            <label text="Edit Do-it-yourself-store" />
    63315857            <space />
    63325858            <key key="shop" value="doityourself" />
    6333             <text key="name" text="Name" />
    6334             <text key="brand" text="Brand" />
    6335             <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" />
     5859            <reference ref="name_brand_oh" />
    63365860        </item>
    63375861        <item name="Hardware" icon="presets/hardware.png" type="node,closedway">
    63385862            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
    … … Note that for a match, at least one positive and no negative is required.  
    63425866            <label text="Edit Hardware Store" />
    63435867            <space />
    63445868            <key key="shop" value="hardware" />
    6345             <text key="name" text="Name" />
    6346             <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" />
     5869            <reference ref="name_oh" />
    63475870        </item>
    63485871        <item name="Paint" icon="presets/paint.png" type="node,closedway">
    63495872            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
    … … Note that for a match, at least one positive and no negative is required.  
    63535876            <label text="Edit Paint Shop" />
    63545877            <space />
    63555878            <key key="shop" value="paint" />
    6356             <text key="name" text="Name" />
    6357             <text key="operator" text="Operator" />
    6358             <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" />
     5879            <reference ref="name_operator_oh" />
    63595880        </item>
    63605881        <separator/>
    63615882        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
    63625883            <label text="Edit Furniture Shop" />
    63635884            <space />
    63645885            <key key="shop" value="furniture" />
    6365             <text key="name" text="Name" />
    6366             <text key="brand" text="Brand" />
    6367             <text key="operator" text="Operator" />
    6368             <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" />
     5886            <reference ref="name_brand_operator_oh" />
    63695887        </item>
    63705888        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway">
    63715889            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
    … … Note that for a match, at least one positive and no negative is required.  
    63765894            <label text="Edit Kitchen Store" />
    63775895            <space />
    63785896            <key key="shop" value="kitchen" />
    6379             <text key="name" text="Name" />
    6380             <text key="brand" text="Brand" />
    6381             <text key="operator" text="Operator" />
    6382             <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" />
     5897            <reference ref="name_brand_operator_oh" />
    63835898        </item>
    63845899        <item name="Curtain" icon="presets/curtain.png" type="node,closedway">
    63855900            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
    … … Note that for a match, at least one positive and no negative is required.  
    63885903            <label text="Edit Curtain Shop" />
    63895904            <space />
    63905905            <key key="shop" value="curtain" />
    6391             <text key="name" text="Name" />
    6392             <text key="operator" text="Operator" />
    6393             <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" />
     5906            <reference ref="name_operator_oh" />
    63945907        </item>
    63955908        <item name="Frame" icon="presets/frame.png" type="node,closedway">
    63965909            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
    … … Note that for a match, at least one positive and no negative is required.  
    64005913            <label text="Edit Frames Shop" />
    64015914            <space />
    64025915            <key key="shop" value="frame" />
    6403             <text key="name" text="Name" />
    6404             <text key="operator" text="Operator" />
    6405             <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" />
     5916            <reference ref="name_operator_oh" />
    64065917        </item>
    64075918        <separator/>
    64085919        <item name="Stationery" icon="presets/stationery.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    64135924            <label text="Edit Stationery Shop" />
    64145925            <space />
    64155926            <key key="shop" value="stationery" />
    6416             <text key="name" text="Name" />
    6417             <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" />
     5927            <reference ref="name_oh" />
    64185928        </item>
    64195929        <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway">
    64205930            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
    … … Note that for a match, at least one positive and no negative is required.  
    64245934            <label text="Edit Copyshop" />
    64255935            <space />
    64265936            <key key="shop" value="copyshop" />
    6427             <text key="name" text="Name" />
    6428             <text key="operator" text="Operator" />
    6429             <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" />
     5937            <reference ref="name_operator_oh" />
    64305938        </item>
    64315939        <item name="Book Store" icon="presets/book.png" type="node,closedway">
    64325940            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=book"
    … … Note that for a match, at least one positive and no negative is required.  
    64375945            <label text="Edit Book Store" />
    64385946            <space />
    64395947            <key key="shop" value="books" />
    6440             <text key="name" text="Name" />
    6441             <text key="brand" text="Brand" />
    6442             <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" />
     5948            <reference ref="name_brand_oh" />
    64435949            <combo key="second_hand" text="Second hand" values="only,yes,no" />
    64445950        </item>
    64455951        <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    64515957            <label text="Edit Newsagent's shop" />
    64525958            <space />
    64535959            <key key="shop" value="newsagent" />
    6454             <text key="name" text="Name" />
    6455             <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" />
     5960            <reference ref="name_oh" />
    64565961        </item>
    64575962        <separator/>
    64585963        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
    … … Note that for a match, at least one positive and no negative is required.  
    64615966            <label text="Edit Travel Agency" />
    64625967            <space />
    64635968            <key key="shop" value="travel_agency" />
    6464             <text key="name" text="Name" />
    6465             <text key="brand" text="Brand" />
    6466             <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" />
     5969            <reference ref="name_brand_oh" />
    64675970        </item>
    64685971        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway">
    64695972            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
    … … Note that for a match, at least one positive and no negative is required.  
    64725975            <label text="Edit Musical Instruments Shop" />
    64735976            <space />
    64745977            <key key="shop" value="musical_instrument" />
    6475             <text key="name" text="Name" />
    6476             <text key="operator" text="Operator" />
    6477             <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" />
     5978            <reference ref="name_operator_oh" />
    64785979        </item>
    64795980        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway">
    64805981            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toy"
    64815982                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=toy"
    64825983                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=toy" />
    64835984            <label text="Edit Toy Shop" />
    6484             <space />           
     5985            <space />
    64855986            <key key="shop" value="toys" />
    6486             <text key="name" text="Name" />
    6487             <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" />
     5987            <reference ref="name_oh" />
    64885988        </item>
    64895989        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway">
    64905990            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
    … … Note that for a match, at least one positive and no negative is required.  
    64935993            <label text="Edit Variety Store" />
    64945994            <space />
    64955995            <key key="shop" value="variety_store" />
    6496             <text key="name" text="Name" />
    6497             <text key="operator" text="Operator" />
    6498             <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" />
     5996            <reference ref="name_operator_oh" />
    64995997        </item>
    65005998    </group> <!-- Other -->
    65015999    <item name="Vending machine" icon="presets/vending_machine.png" type="node">
    … … Note that for a match, at least one positive and no negative is required.  
    65046002                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=vending_machine"
    65056003                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
    65066004        <label text="Edit Vending machine" />
    6507         <space />           
     6005        <space />
    65086006        <key key="amenity" value="vending_machine" />
    65096007        <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
    65106008        <text key="operator" text="Operator" />
    65116009        <text key="ref" text="Reference number" />
    65126010        <text key="note" text="Note" />
    6513         <check key="payment:coins" text="Coins" default="off" />
    6514         <check key="payment:notes" text="Notes" default="off" />
    6515         <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" />
    6516         <check key="payment:debit_cards" text="Debit cards" default="off" />
    6517         <check key="payment:credit_cards" text="Credit cards" default="off" />
    6518         <check key="payment:account_cards" text="Account or loyalty cards" default="off" />
     6011        <check key="payment:coins" text="Coins" />
     6012        <check key="payment:notes" text="Notes" />
     6013        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" />
     6014        <check key="payment:debit_cards" text="Debit cards" />
     6015        <check key="payment:credit_cards" text="Credit cards" />
     6016        <check key="payment:account_cards" text="Account or loyalty cards" />
    65196017    </item>
    65206018  </group> <!-- Shops -->
    65216019  <group name="Geography" icon="presets/peak.svg">
    … … Note that for a match, at least one positive and no negative is required.  
    69406438                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenhouse_horticulture"
    69416439                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
    69426440            <label text="Edit Greenhouse Horticulture" />
    6943             <space />           
     6441            <space />
    69446442            <key key="landuse" value="greenhouse_horticulture" />
    6945             <text key="name" text="Name" /> 
    6946             <text key="operator" text="Operator" />                                                               
    6947         </item>       
     6443            <text key="name" text="Name" />
     6444            <text key="operator" text="Operator" />
     6445        </item>
    69486446        <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation">
    69496447            <label text="Edit Allotments Landuse" />
    69506448            <space />
    … … Note that for a match, at least one positive and no negative is required.  
    70836581                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=garages"
    70846582                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
    70856583            <label text="Edit Garages" />
    7086             <space />           
     6584            <space />
    70876585            <key key="landuse" value="garages" />
    7088             <text key="name" text="Name" />                                                   
     6586            <text key="name" text="Name" />
    70896587            <text key="operator" text="Operator" />
    7090         </item> 
     6588        </item>
    70916589        <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation">
    70926590            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
    70936591                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=railway"
    … … Note that for a match, at least one positive and no negative is required.  
    71626660            <label text="Edit Quarry Landuse" />
    71636661            <space />
    71646662            <key key="landuse" value="quarry" />
    7165             <text key="name" text="Name" />
    7166             <text key="operator" text="Operator" />
     6663            <reference ref="name_operator" />
    71676664        </item>
    71686665    </group> <!-- Landuse -->
    71696666  </group>
    … … Note that for a match, at least one positive and no negative is required.  
    73896886            <space />
    73906887            <key key="type" value="route" />
    73916888            <combo key="route" text="Route type" values="bicycle,bus,road,ferry,ski,foot,hiking,tram,detour,railway,subway" values_context="route type" values_searchable="true" />
    7392             <text key="name" text="Name" />
    7393             <text key="ref" text="Reference" />
     6889            <reference ref="name_ref" />
    73946890            <text key="symbol" text="Symbol description" />
    73956891            <text key="description" text="Description" />
    73966892            <optional>
    … … Note that for a match, at least one positive and no negative is required.  
    75137009            <space />
    75147010            <key key="type" value="bridge" />
    75157011            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    7516             <text key="name" text="Name" />
    7517             <text key="ref" text="Reference" />
     7012            <reference ref="name_ref" />
    75187013            <text key="height" text="Height (meters)" />
    75197014            <text key="length" text="Length (meters)" />
    75207015            <text key="operator" text="Operator" />
    … … Note that for a match, at least one positive and no negative is required.  
    75317026            <space />
    75327027            <key key="type" value="tunnel" />
    75337028            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
    7534             <text key="name" text="Name" />
    7535             <text key="ref" text="Reference" />
     7029            <reference ref="name_ref" />
    75367030            <text key="length" text="Length (meters)" />
    75377031            <text key="operator" text="Operator" />
    75387032            <roles>

  • data/tagging-preset.xsd 

    diff --git a/data/tagging-preset.xsd b/data/tagging-preset.xsd
index af5cdf3..755f17f 100644
    a b  
    9999        <attribute name="ref" type="IDREF" use="required" />
    100100    </complexType>
    101101
    102         <group name="optional_elements">
     102    <group name="optional_elements">
    103103                <choice>
    104104                        <element name="label" type="tns:label" />
    105105                        <element name="space" type="tns:space" />

  • src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java 

    diff --git a/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java
index 0efe5fe..87dbb03 100644
    a b import java.io.InputStream;  
    1010import java.io.InputStreamReader;
    1111import java.io.Reader;
    1212import java.io.UnsupportedEncodingException;
     13import java.util.ArrayList;
     14import java.util.Arrays;
    1315import java.util.Collection;
     16import java.util.HashMap;
     17import java.util.Iterator;
    1418import java.util.LinkedList;
    1519import java.util.List;
     20import java.util.Map;
    1621
    1722import javax.swing.JOptionPane;
    1823
    … … public final class TaggingPresetReader {  
    4550
    4651        return sources;
    4752    }
     53
     54    /**
     55     * Holds a reference to a chunk of  items/objects.
     56     */
     57    public static class Chunk {
     58        public String id;
     59    }
     60
     61    /**
     62     * Holds a reference to an earlier item/object.
     63     */
     64    public static class Reference {
     65        public String ref;
     66    }
    4867   
    4968    public static List<TaggingPreset> readAll(Reader in, boolean validate) throws SAXException {
    5069        XmlObjectParser parser = new XmlObjectParser();
    … … public final class TaggingPresetReader {  
    6584        parser.map("key", TaggingPresetItems.Key.class);
    6685        parser.map("list_entry", TaggingPresetItems.PresetListEntry.class);
    6786        parser.map("item_separator", TaggingPresetItems.ItemSeparator.class);
    68        
     87        parser.mapBoth("chunk", Chunk.class);
     88        parser.map("reference", Reference.class);
     89
    6990        LinkedList<TaggingPreset> all = new LinkedList<TaggingPreset>();
    7091        TaggingPresetMenu lastmenu = null;
    7192        TaggingPresetItems.Roles lastrole = null;
    7293        final List<TaggingPresetItems.Check> checks = new LinkedList<TaggingPresetItems.Check>();
    7394        List<TaggingPresetItems.PresetListEntry> listEntries = new LinkedList<TaggingPresetItems.PresetListEntry>();
     95        final Map<String, List<Object>> byId = new HashMap<String, List<Object>>();
     96        String lastId = null;
     97        Iterator<Object> lastIdIterator = null;
    7498
    7599        if (validate) {
    76100            parser.startWithValidation(in, Main.JOSM_WEBSITE+"/tagging-preset-1.0", "resource://data/tagging-preset.xsd");
    … … public final class TaggingPresetReader {  
    78102            parser.start(in);
    79103        }
    80104        while (parser.hasNext()) {
    81             Object o = parser.next();
     105            final Object o;
     106            if (lastIdIterator != null && lastIdIterator.hasNext()) {
     107                // obtain elements from lastIdIterator with higher priority
     108                o = lastIdIterator.next();
     109            } else {
     110                o = parser.next();
     111            }
     112            if (o instanceof Chunk) {
     113                if (((Chunk) o).id.equals(lastId)) {
     114                    // reset last id on end of object, don't process further
     115                    lastId = null;
     116                    ((Chunk) o).id = null;
     117                    continue;
     118                } else if (lastId == null) {
     119                    // if preset item contains an id, store a mapping for later usage
     120                    lastId = ((Chunk) o).id;
     121                    byId.put(lastId, new ArrayList<Object>());
     122                    continue;
     123                } else {
     124                    throw new IllegalStateException("Cannot deal with nested id objects (lastId was expected to be null)");
     125                }
     126            } else if (lastId != null) {
     127                // add object to mapping for later usage
     128                byId.get(lastId).add(o);
     129                continue;
     130            }
     131            if (o instanceof Reference) {
     132                // if o is a reference, obtain the corresponding objects from the mapping,
     133                // and iterate over those before consuming the next element from parser.
     134                final String ref = ((Reference) o).ref;
     135                if (byId.get(ref) == null) {
     136                    throw new SAXException(tr("Reference {0} is being used before it was defined", ref));
     137                }
     138                lastIdIterator = byId.get(ref).iterator();
     139                continue;
     140            }
    82141            if (!(o instanceof TaggingPresetItem) && !checks.isEmpty()) {
    83142                all.getLast().data.addAll(checks);
    84143                checks.clear();