Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7383)
+++ trunk/data/defaultpresets.xml	(revision 7384)
@@ -3431,5 +3431,5 @@
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Information Office -->
         <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
@@ -3439,4 +3439,5 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
+            <label text="A board with a map." />
             <space />
             <key key="tourism" value="information" />
@@ -3455,5 +3456,5 @@
                 <label text="... other transportation modes possible" />
             </optional>
-        </item>
+        </item> <!-- Map -->
         <item name="Information Board" icon="presets/board.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
@@ -3470,5 +3471,5 @@
             <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants,geology" />
             <text key="description" text="Closer Description" />
-        </item>
+        </item> <!-- Information Board -->
         <item name="Guidepost" icon="presets/guidepost.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
@@ -3491,5 +3492,5 @@
                 <label text="... other transportation modes possible" />
             </optional>
-        </item>
+        </item> <!-- Guidepost -->
         <item name="Information Terminal" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
@@ -3499,15 +3500,15 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
+            <label text="Information access via electronic methods." />
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="terminal" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
             <text key="description" text="Closer description" />
-            <text key="operator" text="Operator" />
             <text key="ref" text="Reference number" />
             <combo key="fee" text="Fee" values="yes,no" />
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-        </item>
+        </item> <!-- Information Terminal -->
         <item name="Audioguide" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
@@ -3517,10 +3518,10 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:information"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:information" />
+            <label text="Information using headphones or a mobile phone." />
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="audioguide" />
-            <text key="name" text="Name" />
+            <reference ref="name_operator" />
             <text key="description" text="Closer description" />
-            <text key="operator" text="Operator" />
             <text key="ref" text="Reference number" />
             <combo key="fee" text="Fee" values="yes,no" />
@@ -3528,5 +3529,5 @@
             <label text="Audioguide via mobile phone?" />
             <text key="phone" text="Phone number" />
-        </item>
+        </item> <!-- Audioguide -->
         <item name="Other Information Point" icon="presets/information.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
@@ -3541,5 +3542,5 @@
             <text key="name" text="Name" />
             <text key="description" text="Closer Description" />
-        </item>
+        </item> <!-- Other Information Point -->
     </group> <!-- Tourism -->
     <group name="Leisure" icon="presets/theme_park.png">