Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 6703)
+++ /trunk/data/defaultpresets.xml	(revision 6704)
@@ -329,4 +329,13 @@
         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
     </chunk>
+    <chunk id="name_wikipedia">
+        <text key="name" text="Name" />
+        <text key="wikipedia" text="Wikipedia" />
+    </chunk>
+    <chunk id="population_postcode_website">
+        <text key="population" text="Population" />
+        <text key="addr:postcode" text="Post code" />
+        <text key="website" text="Website" />
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact">
@@ -1659,7 +1668,6 @@
             <space />
             <key key="waterway" value="canal" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="River" icon="presets/river.png" type="way">
@@ -1673,7 +1681,6 @@
             <space />
             <key key="waterway" value="river" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <text key="wikipedia" text="Wikipedia" />
         </item>
         <separator/>
@@ -1694,6 +1701,5 @@
             <space />
             <key key="waterway" value="waterfall" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="Weir" icon="presets/weir.png" type="node,way">
@@ -1720,6 +1726,5 @@
             <space />
             <key key="waterway" value="dam" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway">
@@ -5408,6 +5413,5 @@
             <space />
             <key key="historic" value="castle" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="Ruins" icon="presets/ruins.png" type="node,closedway">
@@ -6275,6 +6279,5 @@
             <space />
             <key key="place" value="continent" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="Country" icon="presets/places.png" type="node,closedway">
@@ -6282,6 +6285,5 @@
             <space />
             <key key="place" value="country" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="State" icon="presets/places.png" type="node,closedway">
@@ -6289,6 +6291,5 @@
             <space />
             <key key="place" value="state" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="Region" icon="presets/places.png" type="node,closedway">
@@ -6296,6 +6297,5 @@
             <space />
             <key key="place" value="region" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="County" icon="presets/places.png" type="node,closedway">
@@ -6303,9 +6303,6 @@
             <space />
             <key key="place" value="county" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="population" text="Population" />
-            <text key="addr:postcode" text="Post code" />
-            <text key="website" text="Website" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
         </item>
         <separator/>
@@ -6314,9 +6311,6 @@
             <space />
             <key key="place" value="city" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="population" text="Population" />
-            <text key="addr:postcode" text="Post code" />
-            <text key="website" text="Website" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
         </item>
         <item name="Town" icon="presets/places.png" type="node,closedway">
@@ -6330,9 +6324,6 @@
             <space />
             <key key="place" value="town" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="population" text="Population" />
-            <text key="addr:postcode" text="Post code" />
-            <text key="website" text="Website" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
         </item>
         <item name="Suburb" icon="presets/places.png" type="node,closedway">
@@ -6346,9 +6337,6 @@
             <space />
             <key key="place" value="suburb" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="population" text="Population" />
-            <text key="addr:postcode" text="Post code" />
-            <text key="website" text="Website" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
         </item>
         <item name="Village" icon="presets/places.png" type="node,closedway">
@@ -6356,9 +6344,6 @@
             <space />
             <key key="place" value="village" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="population" text="Population" />
-            <text key="addr:postcode" text="Post code" />
-            <text key="website" text="Website" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
         </item>
         <item name="Hamlet" icon="presets/places.png" type="node,closedway">
@@ -6366,9 +6351,6 @@
             <space />
             <key key="place" value="hamlet" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="population" text="Population" />
-            <text key="addr:postcode" text="Post code" />
-            <text key="website" text="Website" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
         </item>
         <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway">
@@ -6376,9 +6358,6 @@
             <space />
             <key key="place" value="isolated_dwelling" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
-            <text key="population" text="Population" />
-            <text key="addr:postcode" text="Post code" />
-            <text key="website" text="Website" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
         </item>
         <item name="Neighbourhood" icon="presets/places.png" type="node,closedway">
@@ -6392,6 +6371,5 @@
             <space />
             <key key="place" value="neighbourhood" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
             <text key="population" text="Population" />
             <text key="website" text="Website" />
@@ -6408,6 +6386,5 @@
             <space />
             <key key="place" value="locality" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
     </group> <!-- Places -->
@@ -6422,7 +6399,6 @@
             <space />
             <key key="natural" value="peak" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Saddle" icon="presets/saddle.svg" type="node">
@@ -6434,7 +6410,6 @@
             <space/>
             <key key="natural" value="saddle" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Glacier" icon="presets/glacier.png" type="node,closedway">
@@ -6446,7 +6421,6 @@
             <space />
             <key key="natural" value="glacier" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Volcano" icon="presets/volcano.png" type="node,closedway">
@@ -6458,7 +6432,6 @@
             <space />
             <key key="natural" value="volcano" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
-            <text key="wikipedia" text="Wikipedia" />
         </item>
         <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway">
@@ -6469,6 +6442,5 @@
             <space />
             <key key="natural" value="cave_entrance" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <separator/>
@@ -6482,6 +6454,5 @@
             <space />
             <key key="place" value="island" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
         <item name="Islet" icon="presets/islet.png" type="node,closedway">
@@ -6493,6 +6464,5 @@
             <space />
             <key key="place" value="islet" />
-            <text key="name" text="Name" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="name_wikipedia" />
         </item>
     </group> <!-- Geography -->