Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15074)
+++ /trunk/data/defaultpresets.xml	(revision 15075)
@@ -326,8 +326,7 @@
         <reference ref="frequency" />
     </chunk>
-    <chunk id="ref_operator_branch">
+    <chunk id="ref_operator">
         <text key="ref" text="Reference" />
         <text key="operator" text="Operator" />
-        <text key="branch" text="Branch operator" />
     </chunk>
     <chunk id="cables">
@@ -344,5 +343,5 @@
         <reference ref="power_loc" />
         <reference ref="voltage_frequency" />
-        <reference ref="ref_operator_branch" />
+        <reference ref="ref_operator" />
     </chunk>
     <chunk id="power_line_extra">
@@ -355,5 +354,4 @@
         <key key="power" value="generator" />
         <reference ref="name_ref_operator" />
-        <text key="branch" text="Branch operator" />
         <text key="start_date" text="Start date" />
     </chunk>
@@ -377,5 +375,5 @@
         <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
         <check key="location:transition" text="Location transition" disable_off="true" />
-        <reference ref="ref_operator_branch" />
+        <reference ref="ref_operator" />
     </chunk>
     <chunk id="rating_phases">
@@ -4917,5 +4915,4 @@
             <key key="power" value="plant" />
             <reference ref="name_ref_operator" />
-            <text key="branch" text="Branch operator" />
             <text key="start_date" text="Start date" />
             <optional text="Output forms of energy (optional):">
@@ -4929,5 +4926,5 @@
                 <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
                 <space />
-                <reference ref="voltage_frequency" />
+                <combo key="plant:source" text="Plant source" values="biofuel,biogas,biomass,coal,gas,oil,diesel,gasoline,nuclear,solar,waste,hydro,tidal,wave,osmotic,geothermal,wind" />
             </optional>
         </item> <!-- Power Plant -->
@@ -5111,5 +5108,5 @@
             <reference ref="power_loc" />
             <reference ref="transformer_voltage_frequency" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <reference ref="optional_transformer_rating_phases_devices_windings" />
         </item> <!-- Power Transformer -->
@@ -5149,5 +5146,5 @@
                 <reference ref="voltage" />
                 <reference ref="cables" />
-                <reference ref="ref_operator_branch" />
+                <reference ref="ref_operator" />
             </optional>
         </item> <!-- Power Switch -->
@@ -5159,5 +5156,5 @@
             <combo key="converter" text="Type of converter" values="lcc,vsc,back-to-back" match="key" values_context="power" />
             <reference ref="voltage_frequency" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <optional>
                 <combo key="poles" text="Amount of poles" values="monopole,bipole" />
@@ -5171,5 +5168,5 @@
             <combo key="compensator" text="Type of compensator" values="shunt_reactor,shunt_capacitor,static_var,statcom,synchronous_condenser,filter,series_reactor,series_capacitor" match="key" values_context="power" />
             <reference ref="voltage_frequency" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <optional>
                 <combo key="rating" text="Power rating (kvar/Mvar)" values="500 kvar,1 Mvar,5 Mvar" />
@@ -5183,5 +5180,5 @@
             <key key="street_cabinet" value="power" />
             <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110" /> <!-- Recheck values -->
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
         </item> <!-- Power Street Cabinet -->
         <separator/>
@@ -5191,5 +5188,5 @@
             <key key="building" value="transformer_tower" />
             <text key="height" text="Height (meters)" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <preset_link preset_name="Power Substation" />
         </item> <!-- Transformer Tower -->
@@ -5211,5 +5208,5 @@
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
         </item> <!-- Power Portal -->
@@ -5222,5 +5219,5 @@
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <optional>
                 <combo key="tower:type" text="Tower type" values="suspension,anchor,termination,branch,transposing,crossing,transition" text_context="power" values_context="power" />
@@ -5277,5 +5274,5 @@
             <space />
             <key key="power" value="insulator" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
         </item> <!-- Insulator -->
         <item name="Power Line" icon="presets/power/line.svg" type="way" preset_name_label="true">
@@ -5284,5 +5281,5 @@
             <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue!" />
             <reference ref="voltage_frequency" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <optional>
                 <reference ref="cables_circuits" />
@@ -5297,5 +5294,5 @@
             <key key="power" value="cable" />
             <reference ref="voltage_frequency" />
-            <reference ref="ref_operator_branch" />
+            <reference ref="ref_operator" />
             <optional>
                 <reference ref="cables_circuits" />
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 15074)
+++ /trunk/data/validator/combinations.mapcss	(revision 15075)
@@ -223,5 +223,7 @@
 }
 
-/* {0.tag} together with {1.key}, see #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
+/* {0.tag} together with {1.key}, see #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
+*[power=plant][voltage],
+*[power=plant][frequency],
 *[internet_access=no][internet_access:fee],
 node[power=transformer][voltage],