Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 13785)
+++ trunk/data/defaultpresets.xml	(revision 13786)
@@ -263,6 +263,6 @@
     </chunk>
     <chunk id="leaf">
-        <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
-        <combo key="leaf_cycle" text="Cycle" values_searchable="true" >
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
+        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
             <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
             <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
@@ -270,4 +270,13 @@
             <list_entry value="semi_evergreen" short_description="Plants that lose most, but not all, of their foliage for a fraction of the year." />
             <list_entry value="mixed" short_description="Habitat with evergreen and deciduous vegetation." />
+        </combo>
+    </chunk>
+    <chunk id="leaf_without_mixed">
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
+	    <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
+            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
+            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
+            <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
+            <list_entry value="semi_evergreen" short_description="Plants that lose most, but not all, of their foliage for a fraction of the year." />
         </combo>
     </chunk>
@@ -1809,9 +1818,10 @@
                   pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:barrier=hedge"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:barrier=hedge" />
+            <space />
             <key key="barrier" value="hedge" />
-            <optional>
+            <reference ref="leaf" />
+            <optional>
+                <reference ref="genus_species_taxon" />
                 <text key="height" text="Height (meters)" length="7" />
-                <reference ref="genus_species_taxon" />
-                <reference ref="leaf" />
             </optional>
         </item> <!-- Hedge -->
@@ -7248,5 +7258,8 @@
             <space />
             <key key="amenity" value="fountain" />
-            <text key="name" text="Name" />
+            <optional>
+                <text key="name" text="Name" />
+                <check key="drinking_water" text="Drinking Water" />
+            </optional>
         </item> <!-- Fountain -->
         <item name="Water Well" icon="presets/landmark/water_well.svg" type="node,closedway" preset_name_label="true">
@@ -9400,4 +9413,5 @@
             <check key="payment:laser" text="Laser" match="keyvalue" />
             <check key="payment:maestro" text="Maestro" match="keyvalue" />
+            <check key="payment:postfinance_card" text="PostFinance Card (ch)" match="keyvalue" />
             <check key="payment:visa_debit" text="Visa Debit" match="keyvalue" />
             <check key="payment:visa_electron" text="Visa Electron" match="keyvalue" />
@@ -9417,6 +9431,4 @@
         <checkgroup columns="4">
             <check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" />
-            <check key="payment:ep_cash" text="Cash (ch)" match="keyvalue" />
-            <check key="payment:ep_chipknip" text="Chipknip (nl)" match="keyvalue" />
             <check key="payment:ep_geldkarte" text="Geldkarte (de)" match="keyvalue" />
             <check key="payment:ep_mep" text="Mep (pt)" match="keyvalue" />
@@ -9426,6 +9438,4 @@
             <check key="payment:ep_monedero4b" text="Mondero 4b (es)" match="keyvalue" />
             <check key="payment:ep_moneo" text="Moneo (fr)" match="keyvalue" />
-            <check key="payment:ep_proton" text="Proton (be)" match="keyvalue" />
-            <check key="payment:ep_quick" text="Quick (au)" match="keyvalue" />
         </checkgroup>
         <space />
@@ -10502,9 +10512,5 @@
             <space />
             <key key="natural" value="tree" />
-            <text key="name" text="Name" />
-            <text key="height" text="Height (meters)" />
-            <text key="circumference" text="Circumference (meters)" />
-            <reference ref="genus_species_taxon" />
-            <reference ref="leaf" />
+            <reference ref="leaf_without_mixed" />
             <combo key="denotation" text="Denotation" values_searchable="true" values_context="tree denotation" >
                 <list_entry value="landmark" short_description="Trees remarkable due to its size or prominent location, usually visible from great distances and useful for navigation." />
@@ -10514,4 +10520,14 @@
                 <list_entry value="agricultural" short_description="Trees in agricultural use." />
             </combo>
+            <optional>
+                <reference ref="genus_species_taxon" />
+                <space />
+                <text key="height" text="Height (meters)" />
+                <text key="diameter_crown" text="Diameter crown (meters)" />
+                <text key="circumference" text="Circumference (meters)" />
+                <space />
+                <text key="name" text="Name" />
+                <text key="start_date" text="Start date" />
+            </optional>
         </item> <!-- Tree -->
         <item name="Tree Row" icon="presets/landmark/tree_row.svg" type="way" preset_name_label="true">
@@ -10529,8 +10545,8 @@
             <space />
             <key key="natural" value="tree_row" />
-            <text key="height" text="Height (meters)" />
+            <reference ref="leaf" />
             <optional>
                 <reference ref="genus_species_taxon" />
-                <reference ref="leaf" />
+                <text key="height" text="Height (meters)" />
             </optional>
         </item> <!-- Tree Row -->
@@ -10846,8 +10862,9 @@
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=plant_nursery"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:landuse=plant_nursery" />
-            <space />
             <key key="landuse" value="plant_nursery" />
+            <reference ref="optional_name_operator" />
+            <space />
+            <reference ref="leaf" />
             <reference ref="genus_species_taxon" />
-            <reference ref="optional_name_operator" />
         </item> <!-- Plant Nursery -->
         <item name="Salt Pond" icon="presets/landuse/salt_pond.svg" type="closedway,multipolygon" preset_name_label="true">