Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 17354)
+++ /trunk/resources/data/defaultpresets.xml	(revision 17355)
@@ -1263,6 +1263,5 @@
             <key key="highway" value="services" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
+                <reference ref="name_operator" />
                 <check key="toilets" text="Toilets" />
             </optional>
@@ -2012,6 +2011,5 @@
             <combo key="location" text="Location" values="overground,underground" values_context="pipeline" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
+                <reference ref="name_operator" />
                 <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
                 <text key="pressure" text="Pressure (bar)" />
@@ -2361,18 +2359,15 @@
             <key key="railway" value="switch" />
             <combo key="railway:switch" text="Type" values="abt,default,double_slip,single_slip,three_way,wye" />
-            <text key="ref" text="Reference" />
-            <text key="operator" text="Operator" />
+            <reference ref="ref_operator" />
         </item> <!-- Railway Switch -->
         <item name="Railway crossing" icon="presets/transport/railway/railway_crossing.svg" type="node" preset_name_label="true">
             <link wiki="Tag:railway=railway_crossing" />
             <key key="railway" value="railway_crossing" />
-            <text key="ref" text="Reference" />
-            <text key="operator" text="Operator" />
+            <reference ref="ref_operator" />
         </item> <!-- Railway crossing -->
         <item name="Railway Signal" icon="presets/transport/railway/signal.svg" type="node" preset_name_label="true">
             <link wiki="Tag:railway=signal" />
             <key key="railway" value="signal" />
-            <text key="ref" text="Reference" />
-            <text key="operator" text="Operator" />
+            <reference ref="ref_operator" />
         </item> <!-- Railway Signal -->
         <item name="Railway milestone" icon="presets/transport/railway/milestone.svg" type="node" preset_name_label="true">
@@ -2561,6 +2556,5 @@
             <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Eni,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Socar,Statoil,Sunoco,Tamoil,Texaco,Total,Independent" values_searchable="true" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
+                <reference ref="name_operator" />
                 <reference ref="oh_wheelchair" />
                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
@@ -4336,6 +4330,5 @@
             <space />
             <key key="emergency" value="fire_extinguisher" />
-            <text key="ref" text="Reference" />
-            <text key="operator" text="Operator" />
+            <reference ref="ref_operator" />
             <check key="indoor" text="Indoor" />
         </item> <!-- Fire Extinguisher -->
@@ -4344,6 +4337,5 @@
             <space />
             <key key="emergency" value="fire_hose" />
-            <text key="ref" text="Reference" />
-            <text key="operator" text="Operator" />
+            <reference ref="ref_operator" />
         </item> <!-- Fire Hose -->
         <item name="Fire Hydrant" icon="presets/service/fire_hydrant.svg" type="node" preset_name_label="true">
@@ -4427,12 +4419,10 @@
             <link wiki="Tag:emergency=phone" />
             <key key="emergency" value="phone" />
-            <text key="ref" text="Reference" />
-            <text key="operator" text="Operator" />
+            <reference ref="ref_operator" />
         </item> <!-- Emergency Phone -->
         <item name="Siren" icon="presets/emergency/siren.svg" type="node" preset_name_label="true">
             <link wiki="Tag:emergency=siren" />
             <key key="emergency" value="siren" />
-            <text key="ref" text="Reference" />
-            <text key="operator" text="Operator" />
+            <reference ref="ref_operator" />
             <space />
             <combo key="siren:type" text="Type" values="pneumatic,electronic,mechanical" />
@@ -5412,8 +5402,5 @@
             <space />
             <combo key="police" text="Type" values="barracks,car_pound,checkpoint,detention,naval_base,offices,range,storage,training_area,yes" values_context="police" match="keyvalue!" values_searchable="true" />
-            <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
-            </optional>
+            <reference ref="optional_name_operator" />
             <reference ref="link_contact_address" />
         </item> <!-- Non-public police facility -->
@@ -5639,6 +5626,5 @@
             <text key="operator" text="Operator" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="ref" text="Reference" />
+                <reference ref="name_ref" />
             </optional>
             <space />
@@ -6217,6 +6203,5 @@
                 <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
                 <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
-                <text key="ref" text="Reference" />
-                <text key="operator" text="Operator" />
+                <reference ref="ref_operator" />
             </optional>
         </item> <!-- Terminal -->
@@ -6289,6 +6274,5 @@
             <key key="power" value="catenary_mast" />
             <optional>
-                <text key="ref" text="Reference" />
-                <text key="operator" text="Operator" />
+                <reference ref="ref_operator" />
             </optional>
         </item> <!-- Catenary mast -->