Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6014)
+++ trunk/data/defaultpresets.xml	(revision 6044)
@@ -4040,9 +4040,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=toilets" />
             <key key="amenity" value="toilets" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Reference number" />
+            <text key="description" text="Description" />
+            <combo key="drinking_water" text="Drinking water" values="yes,no" />
             <combo key="fee" text="Fee" values="yes,no" />
+            <text key="operator" text="Operator" />
             <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
-            <text key="note" text="Note" />
         </item>
         <item name="Post Box" icon="styles/standard/service/post_box.png" type="node">
@@ -4166,7 +4166,11 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=drinking_water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=drinking_water" />
-            <label text="Edit Drinking Water" />
+            <label text="Edit Source of Potable Water" />
             <key key="amenity" value="drinking_water" />
-            <text key="name" text="Name" />
+            <combo key="indoor" text="Indoor" values="yes,no" />
+            <optional>
+                <text key="name" text="Name" />
+                <text key="description" text="Description" />
+            </optional>
         </item>
         <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node">
@@ -5106,5 +5110,6 @@
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />                      
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+            <text key="website" text="Website" />
         </item>     	
         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway">
@@ -5117,6 +5122,20 @@
             <key key="shop" value="greengrocer" />
             <text key="name" text="Name" />            
-            <text key="operator" text="Operator" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+            <text key="website" text="Website" />
+        </item>
+        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=farm"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=farm"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=farm"/>
+            <label text="Edit Farm Stand" />
+            <space />
+            <key key="shop" value="farm" />
+            <text key="name" text="Name" />
+            <text key="description" text="Description" />
+            <text key="phone" text="Phone Number" match="key" />
+            <text key="website" text="Website" />
+            <combo key="organic" text="Organic" values="yes,no,only" />
         </item>
         <separator/>