Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17931)
+++ trunk/resources/data/defaultpresets.xml	(revision 17932)
@@ -67,5 +67,5 @@
     <chunk id="highway_yesno_incline_oneway_lit_width_busbay_sidewalk">
         <reference ref="highway_yesno_incline_oneway_lit_width" />
-		<combo key="bus_bay" text="Bus bay" values="both,left,right" />
+        <combo key="bus_bay" text="Bus bay" values="both,left,right" />
         <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
     </chunk>
@@ -812,5 +812,5 @@
                 </checkgroup>
                 <text key="width" text="Width (meters)" />
-				<combo key="bus_bay" text="Bus bay" values="both,left,right" />
+                <combo key="bus_bay" text="Bus bay" values="both,left,right" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
                 <checkgroup columns="2">
@@ -842,5 +842,5 @@
                 </checkgroup>
                 <text key="width" text="Width (meters)" />
-				<combo key="bus_bay" text="Bus bay" values="both,left,right" />
+                <combo key="bus_bay" text="Bus bay" values="both,left,right" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
             </optional>
@@ -1469,7 +1469,7 @@
         <item name="Named Junction" name_context="junction=yes" icon="presets/vehicle/junction.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:junction=yes" />
-			<space />
+            <space />
             <label text="Used in some countries for a named road junction who’s name serves for local orientation." />
-			<space />
+            <space />
             <key key="junction" value="yes" />
             <text key="name" text="Name" />
@@ -1975,5 +1975,5 @@
         <item name="Spring" icon="presets/landmark/spring.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=spring" />
-			<space />
+            <space />
             <label text="A point where groundwater naturally flows to the surface of the earth from underground." />
             <space />
@@ -2065,5 +2065,5 @@
         <item name="Water" name_context="natural" icon="presets/nautical/water.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=water" />
-			<space />
+            <space />
             <label text="A body of standing water, such as a lake or pond." />
             <space />
@@ -2080,5 +2080,5 @@
         <item name="Coastline" icon="presets/nautical/coast_line.svg" type="way,closedway" preset_name_label="true">
             <link wiki="Tag:natural=coastline" />
-			<space />
+            <space />
             <label text="Line between the sea and land (with the water on the right side of the way)." />
             <space />
@@ -2097,5 +2097,5 @@
         <item name="Wetland" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=wetland" />
-			<space />
+            <space />
             <label text="Waterlogged area, either permanently or seasonally with vegetation." />
             <space />
@@ -2107,5 +2107,5 @@
         <item name="Mud" icon="presets/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=mud" />
-			<space />
+            <space />
             <label text="Large area covered with mud." />
             <space />
@@ -2115,5 +2115,5 @@
         <item name="Beach" icon="presets/nautical/beach.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=beach" />
-			<space />
+            <space />
             <label text="A flat area of sand, gravel or pebble next to water." />
             <space />
@@ -2131,5 +2131,5 @@
         <item name="Bay" icon="presets/nautical/bay.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=bay" />
-			<space />
+            <space />
             <label text="An area of water mostly surrounded by land but with level connection to the ocean or a lake." />
             <space />
@@ -2142,5 +2142,5 @@
         <item name="Cape" icon="presets/nautical/cape.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=cape" />
-			<space />
+            <space />
             <label text="A prominent, elevated piece of land sticking out into the sea or large lake." />
             <space />
@@ -3522,5 +3522,5 @@
         <item name="Information Office" icon="presets/misc/information/informationoffice.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:information=office" />
-			<space />
+            <space />
             <label text="An office where you can get information about a town or region." />
             <space />
@@ -3533,5 +3533,5 @@
         <item name="Map" icon="presets/misc/information/map.svg" type="node" preset_name_label="true">
             <link wiki="Tag:information=map" />
-			<space />
+            <space />
             <label text="A board with a map." />
             <space />
@@ -3556,5 +3556,5 @@
             <space />
             <label text="A board with information." />
-			<space />
+            <space />
             <key key="tourism" value="information" />
             <key key="information" value="board" />
@@ -3565,5 +3565,5 @@
         <item name="Guidepost" icon="presets/misc/information/guidepost.svg" type="node" preset_name_label="true">
             <link wiki="Tag:information=guidepost" />
-			<space />
+            <space />
             <label text="A Signpost/Guidepost to indicate the directions to different destinations." />
             <space />
@@ -3601,5 +3601,5 @@
         <item name="Information Terminal" icon="presets/misc/information/information.svg" type="node" preset_name_label="true">
             <link wiki="Tag:information=terminal" />
-			<space />
+            <space />
             <label text="Information access via electronic methods." />
             <space />
@@ -3615,5 +3615,5 @@
         <item name="Audio Guide" icon="presets/misc/information/audioguide.svg" type="node" preset_name_label="true">
             <link wiki="Tag:information=audioguide" />
-			<space />
+            <space />
             <label text="Information using headphones or a mobile phone." />
             <space />
@@ -4134,5 +4134,5 @@
         <item name="Community Centre" icon="presets/service/community_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:amenity=community_centre" />
-			<space />
+            <space />
             <label text="Community Centre" />
             <space />
@@ -7982,5 +7982,5 @@
             <label text="A farm within a bigger settlement" />
             <label text="(please use isolated_dwelling for an isolated farm)" />
-			<space />
+            <space />
             <key key="place" value="farm" />
             <reference ref="name_wikipedia_wikidata" />
@@ -8004,5 +8004,5 @@
         <item name="Peak" icon="presets/landmark/peak.svg" type="node" preset_name_label="true">
             <link wiki="Tag:natural=peak" />
-			<space />
+            <space />
             <label text="The top (summit) of a mountain or hill." />
             <space />
@@ -8013,5 +8013,5 @@
         <item name="Saddle" icon="presets/landmark/saddle.svg" type="node" preset_name_label="true">
             <link wiki="Tag:natural=saddle" />
-			<space />
+            <space />
             <label text="A saddle point between mountains or hills." />
             <space/>
@@ -8022,5 +8022,5 @@
         <item name="Glacier" icon="presets/landmark/glacier.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=glacier" />
-			<space />
+            <space />
             <label text="A persistent body of dense ice that is constantly moving under its own weight." />
             <space />
@@ -8031,5 +8031,5 @@
         <item name="Volcano" icon="presets/landmark/volcano.svg" type="node" preset_name_label="true">
             <link wiki="Tag:natural=volcano" />
-			<space />
+            <space />
             <label text="A volcano, either dormant, extinct or active." />
             <space />
@@ -8044,5 +8044,5 @@
         <item name="Ridge" icon="presets/landmark/ridge.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=ridge" />
-			<space />
+            <space />
             <label text="A mountain or hill ridge." />
             <space />
@@ -8053,5 +8053,5 @@
         <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=valley" />
-			<space />
+            <space />
             <label text="A low area between hills." />
             <space />
@@ -8061,5 +8061,5 @@
         <item name="Cliff" icon="presets/misc/cliff.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=cliff" />
-			<space />
+            <space />
             <label text="A steep rock face exposure, with a significant vertical, or near vertical (leave the lower face to the right of the way)." />
             <space />
@@ -8087,5 +8087,5 @@
         <item name="Cave Entrance" icon="presets/landmark/cave_entrance.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=cave_entrance" />
-			<space />
+            <space />
             <label text="The entrance to a cave." />
             <space />
@@ -8120,5 +8120,5 @@
         <item name="Shrub" icon="presets/landmark/shrub.svg" type="node" preset_name_label="true">
             <link wiki="Tag:natural=shrub" />
-			<space />
+            <space />
             <label text="A single shrub." />
             <space />
@@ -8135,5 +8135,5 @@
         <item name="Tree" icon="presets/landmark/trees.svg" type="node" preset_name_label="true">
             <link wiki="Tag:natural=tree" />
-			<space />
+            <space />
             <label text="A single tree." />
             <space />
@@ -8160,5 +8160,5 @@
         <item name="Tree Row" icon="presets/landmark/tree_row.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=tree_row" />
-			<space />
+            <space />
             <label text="A line of trees." />
             <space />
@@ -8170,8 +8170,8 @@
             </optional>
         </item> <!-- Tree Row -->
-		<separator />
+        <separator />
         <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" name_context="natural" preset_name_label="true">
             <link wiki="Tag:natural=wood" />
-			<space />
+            <space />
             <label text="Woodland where timber production does not dominate use." />
             <space />
@@ -8195,5 +8195,5 @@
         <item name="Grassland" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=grassland" />
-			<space />
+            <space />
             <label text="Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-woody) plants. Excludes cultivated areas and wetlands." />
             <space />
@@ -8211,5 +8211,5 @@
         <item name="Scree" icon="presets/landuse/scree.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=scree" />
-			<space />
+            <space />
             <label text="An accumulation of loose angular rocks." />
             <space />
@@ -8219,5 +8219,5 @@
         <item name="Shingle" icon="presets/landuse/shingle.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=shingle" />
-			<space />
+            <space />
             <label text="An accumulation of loose rounded rocks on a beach or riverbed." />
             <space />
@@ -8227,5 +8227,5 @@
         <item name="Fell" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=fell" />
-			<space />
+            <space />
             <label text="Bare upper lying uncultivated land principally covered with grass and often grazed." />
             <space />
@@ -8235,5 +8235,5 @@
         <item name="Scrub" icon="presets/landuse/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=scrub" />
-			<space />
+            <space />
             <label text="Bare lower lying uncultivated land with bushes but little or no tree cover." />
             <space />
@@ -8246,5 +8246,5 @@
         <item name="Heath" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=heath" />
-			<space />
+            <space />
             <label text="Bare lower lying uncultivated land with a shrubland habitat found mainly on free-draining infertile, acidic soils, and is characterised by open, low-growing woody vegetation." />
             <space />
@@ -8254,5 +8254,5 @@
         <item name="Sand" icon="presets/landuse/sand.svg" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=sand" />
-			<space />
+            <space />
             <label text="Large area covered with sand." />
             <space />
@@ -8262,5 +8262,5 @@
         <item name="Bare Rock" type="closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:natural=bare_rock" />
-			<space />
+            <space />
             <label text="For areas of solid visible rock that is sparsely vegetated or not vegetated at all." />
             <space />
@@ -8270,5 +8270,5 @@
         <item name="Rock" icon="presets/misc/rock.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=rock" />
-			<space />
+            <space />
             <label text="A notable rock or group of rocks, with at least one of them firmly attached to the underlying bedrock." />
             <space />
@@ -8281,5 +8281,5 @@
         <item name="Stone" icon="presets/misc/stone.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=stone" />
-			<space />
+            <space />
             <label text="A single notable free-standing rock, which may differ from the composition of the terrain it lies in." />
             <space />