diff --git a/datasets/GM0014_groningen/GM0014_groningen.derived.ad b/datasets/GM0014_groningen/GM0014_groningen.derived.ad
index 12f3e4e463..8cc178fbf3 100644
--- a/datasets/GM0014_groningen/GM0014_groningen.derived.ad
+++ b/datasets/GM0014_groningen/GM0014_groningen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0014_groningen
-- id = 128616
-- parent_id = 128616
+- id = 129304
+- parent_id = 129304
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0014_groningen/graph_values.yml b/datasets/GM0014_groningen/graph_values.yml
index a88b15b491..2e174b63ef 100644
--- a/datasets/GM0014_groningen/graph_values.yml
+++ b/datasets/GM0014_groningen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 41967.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15019705220995302
-    :network_gas: 0.17391621284525827
-    :ambient_heat: 0.6758867349447886
+    :electricity: 0.18147055227187414
+    :network_gas: 0.18338131091727508
+    :ambient_heat: 0.6351481368108508
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 118786.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 6253.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2094331710889209
-    :network_gas: 0.16226731564431426
-    :ambient_heat: 0.6282995132667649
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0034_almere/GM0034_almere.derived.ad b/datasets/GM0034_almere/GM0034_almere.derived.ad
index a25dced0cf..315042435a 100644
--- a/datasets/GM0034_almere/GM0034_almere.derived.ad
+++ b/datasets/GM0034_almere/GM0034_almere.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0034_almere
-- id = 128521
-- parent_id = 128521
+- id = 129209
+- parent_id = 129209
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0034_almere/graph_values.yml b/datasets/GM0034_almere/graph_values.yml
index 62b9ca3275..8b6e33b078 100644
--- a/datasets/GM0034_almere/graph_values.yml
+++ b/datasets/GM0034_almere/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 19386.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.17109387622439878
-    :network_gas: 0.05898368076580681
-    :ambient_heat: 0.7699224430097944
+    :electricity: 0.2082956294673982
+    :network_gas: 0.06266828558227176
+    :ambient_heat: 0.72903608495033
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 85128.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 0.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.23636878823013552
-    :network_gas: 0.05452484707945555
-    :ambient_heat: 0.709106364690409
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad
index 9edaea4203..74418223ec 100644
--- a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad
+++ b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0037_stadskanaal
-- id = 128761
-- parent_id = 128761
+- id = 129449
+- parent_id = 129449
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0037_stadskanaal/graph_values.yml b/datasets/GM0037_stadskanaal/graph_values.yml
index 592d327818..9c4223fbfe 100644
--- a/datasets/GM0037_stadskanaal/graph_values.yml
+++ b/datasets/GM0037_stadskanaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3013.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14834373772278286
-    :network_gas: 0.1841094425246942
-    :ambient_heat: 0.667546819752523
+    :electricity: 0.1791110666961636
+    :network_gas: 0.19399901166058714
+    :ambient_heat: 0.6268899216432493
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15182.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 21.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20702002704604286
-    :network_gas: 0.17191989181582618
-    :ambient_heat: 0.6210600811381308
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0047_veendam/GM0047_veendam.derived.ad b/datasets/GM0047_veendam/GM0047_veendam.derived.ad
index 9d394cfd14..e64d64d2dc 100644
--- a/datasets/GM0047_veendam/GM0047_veendam.derived.ad
+++ b/datasets/GM0047_veendam/GM0047_veendam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0047_veendam
-- id = 128788
-- parent_id = 128788
+- id = 129476
+- parent_id = 129476
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0047_veendam/graph_values.yml b/datasets/GM0047_veendam/graph_values.yml
index 1b433e311e..c8963a72c8 100644
--- a/datasets/GM0047_veendam/graph_values.yml
+++ b/datasets/GM0047_veendam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2545.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1487848263731086
-    :network_gas: 0.1816834549479024
-    :ambient_heat: 0.6695317186789889
+    :electricity: 0.17967233680149178
+    :network_gas: 0.191473292463195
+    :ambient_heat: 0.6288543707353131
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12890.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 98.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2075947169980214
-    :network_gas: 0.16962113200791207
-    :ambient_heat: 0.6227841509940665
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad
index 91c15c65b7..7818733e22 100644
--- a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad
+++ b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0050_zeewolde
-- id = 128826
-- parent_id = 128826
+- id = 129514
+- parent_id = 129514
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0050_zeewolde/graph_values.yml b/datasets/GM0050_zeewolde/graph_values.yml
index 4584d43950..cec2a4589d 100644
--- a/datasets/GM0050_zeewolde/graph_values.yml
+++ b/datasets/GM0050_zeewolde/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2749.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.160958893706962
-    :network_gas: 0.114726084611709
-    :ambient_heat: 0.7243150216813291
+    :electricity: 0.19523450566356218
+    :network_gas: 0.12144342934585232
+    :ambient_heat: 0.6833220649905856
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8836.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 0.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22336738094554506
-    :network_gas: 0.10653047621781739
-    :ambient_heat: 0.6701021428366376
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad
index 4fc7310781..bf359869ee 100644
--- a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad
+++ b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0059_achtkarspelen
-- id = 128516
-- parent_id = 128516
+- id = 129204
+- parent_id = 129204
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0059_achtkarspelen/graph_values.yml b/datasets/GM0059_achtkarspelen/graph_values.yml
index 34b533d0d2..55b38196ac 100644
--- a/datasets/GM0059_achtkarspelen/graph_values.yml
+++ b/datasets/GM0059_achtkarspelen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2220.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1506233467278647
-    :network_gas: 0.17157159299674402
-    :ambient_heat: 0.6778050602753912
+    :electricity: 0.18201372329290208
+    :network_gas: 0.18093703771930172
+    :ambient_heat: 0.6370492389877962
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12144.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 16.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20998767196346685
-    :network_gas: 0.16004931214613038
-    :ambient_heat: 0.6299630158904028
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0060_ameland/GM0060_ameland.derived.ad b/datasets/GM0060_ameland/GM0060_ameland.derived.ad
index 216c7e9980..0e54672266 100644
--- a/datasets/GM0060_ameland/GM0060_ameland.derived.ad
+++ b/datasets/GM0060_ameland/GM0060_ameland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0060_ameland
-- id = 128524
-- parent_id = 128524
+- id = 129212
+- parent_id = 129212
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0060_ameland/graph_values.yml b/datasets/GM0060_ameland/graph_values.yml
index a620fea366..a554002e7d 100644
--- a/datasets/GM0060_ameland/graph_values.yml
+++ b/datasets/GM0060_ameland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2193.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14894514981217385
-    :network_gas: 0.18080167603304376
-    :ambient_heat: 0.6702531741547824
+    :electricity: 0.17987638728883018
+    :network_gas: 0.19055506391651975
+    :ambient_heat: 0.6295685487946502
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 1748.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 13.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20780354473563287
-    :network_gas: 0.16878582105746626
-    :ambient_heat: 0.6234106342069009
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad
index c05e1727d6..7428048853 100644
--- a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad
+++ b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0072_harlingen
-- id = 128625
-- parent_id = 128625
+- id = 129313
+- parent_id = 129313
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0072_harlingen/graph_values.yml b/datasets/GM0072_harlingen/graph_values.yml
index 709e442ac1..089d4a64a7 100644
--- a/datasets/GM0072_harlingen/graph_values.yml
+++ b/datasets/GM0072_harlingen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1555.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15255911608898823
-    :network_gas: 0.16092486151056473
-    :ambient_heat: 0.6865160224004471
+    :electricity: 0.18448233236549777
+    :network_gas: 0.16982828051609075
+    :ambient_heat: 0.6456893871184113
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7885.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 893.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21250296665173254
-    :network_gas: 0.14998813339306755
-    :ambient_heat: 0.6375088999551999
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad
index 7c29fd7ae4..a3fb4871a0 100644
--- a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad
+++ b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0074_heerenveen
-- id = 128630
-- parent_id = 128630
+- id = 129318
+- parent_id = 129318
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0074_heerenveen/graph_values.yml b/datasets/GM0074_heerenveen/graph_values.yml
index 513f669e45..dacffb3491 100644
--- a/datasets/GM0074_heerenveen/graph_values.yml
+++ b/datasets/GM0074_heerenveen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6577.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1523083200991893
-    :network_gas: 0.1623042394544588
-    :ambient_heat: 0.6853874404463518
+    :electricity: 0.18416230687294702
+    :network_gas: 0.17126839735558966
+    :ambient_heat: 0.6445692957714634
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 23643.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 228.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2121773326834904
-    :network_gas: 0.1512906692660361
-    :ambient_heat: 0.6365319980504734
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad
index 1c71e3307c..f69ddf9017 100644
--- a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad
+++ b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0080_leeuwarden
-- id = 128665
-- parent_id = 128665
+- id = 129353
+- parent_id = 129353
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0080_leeuwarden/graph_values.yml b/datasets/GM0080_leeuwarden/graph_values.yml
index 5b7f8358d4..f079aa9de5 100644
--- a/datasets/GM0080_leeuwarden/graph_values.yml
+++ b/datasets/GM0080_leeuwarden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 20546.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15199768551292586
-    :network_gas: 0.16401272967890768
-    :ambient_heat: 0.6839895848081664
+    :electricity: 0.18376600568028184
+    :network_gas: 0.17305175535160913
+    :ambient_heat: 0.6431822389681089
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 62935.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 8069.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21177390327335238
-    :network_gas: 0.1529043869065883
-    :ambient_heat: 0.6353217098200594
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad
index e6d49500df..dd18d9ac24 100644
--- a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad
+++ b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0085_ooststellingwerf
-- id = 128715
-- parent_id = 128715
+- id = 129403
+- parent_id = 129403
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0085_ooststellingwerf/graph_values.yml b/datasets/GM0085_ooststellingwerf/graph_values.yml
index 9b1c29c0cf..92acef4a32 100644
--- a/datasets/GM0085_ooststellingwerf/graph_values.yml
+++ b/datasets/GM0085_ooststellingwerf/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2637.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14998955085653634
-    :network_gas: 0.17505747028905003
-    :ambient_heat: 0.6749529788544136
+    :electricity: 0.181206221309921
+    :network_gas: 0.18457080199961187
+    :ambient_heat: 0.6342229766904671
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11388.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 11.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20916318824721178
-    :network_gas: 0.16334724701115064
-    :ambient_heat: 0.6274895647416376
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad
index a06eec01c0..d650f6e026 100644
--- a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad
+++ b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0086_opsterland
-- id = 128718
-- parent_id = 128718
+- id = 129406
+- parent_id = 129406
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0086_opsterland/graph_values.yml b/datasets/GM0086_opsterland/graph_values.yml
index d430a94bca..b6f39bbe04 100644
--- a/datasets/GM0086_opsterland/graph_values.yml
+++ b/datasets/GM0086_opsterland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2168.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15203369682146184
-    :network_gas: 0.1638146674819598
-    :ambient_heat: 0.6841516356965782
+    :electricity: 0.18381194358960307
+    :network_gas: 0.172845034454916
+    :ambient_heat: 0.6433430219554811
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13088.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 64.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21182067784179104
-    :network_gas: 0.1527172886328335
-    :ambient_heat: 0.6354620335253754
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad
index 3c532839f7..f35d60ce97 100644
--- a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad
+++ b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0088_schiermonnikoog
-- id = 128749
-- parent_id = 128749
+- id = 129437
+- parent_id = 129437
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0088_schiermonnikoog/graph_values.yml b/datasets/GM0088_schiermonnikoog/graph_values.yml
index 98eccb9fb0..2baa743160 100644
--- a/datasets/GM0088_schiermonnikoog/graph_values.yml
+++ b/datasets/GM0088_schiermonnikoog/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 592.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14718312625434485
-    :network_gas: 0.19049280560110332
-    :ambient_heat: 0.6623240681445518
+    :electricity: 0.17763508478058265
+    :network_gas: 0.20064094007223235
+    :ambient_heat: 0.6217239751471849
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 586.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 26.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20550679653264836
-    :network_gas: 0.17797281386940433
-    :ambient_heat: 0.6165203895979473
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad
index 664d54c751..21ab569543 100644
--- a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad
+++ b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0090_smallingerland
-- id = 128757
-- parent_id = 128757
+- id = 129445
+- parent_id = 129445
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0090_smallingerland/graph_values.yml b/datasets/GM0090_smallingerland/graph_values.yml
index b0bbfaa9eb..57509d890b 100644
--- a/datasets/GM0090_smallingerland/graph_values.yml
+++ b/datasets/GM0090_smallingerland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 7277.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15170388868677714
-    :network_gas: 0.1656286122227256
-    :ambient_heat: 0.6826674990904972
+    :electricity: 0.1833912678898139
+    :network_gas: 0.1747380778946917
+    :ambient_heat: 0.6418706542154944
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 25777.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 159.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2113922387319227
-    :network_gas: 0.15443104507230698
-    :ambient_heat: 0.6341767161957703
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad
index f8f618f1ee..f14703e8da 100644
--- a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad
+++ b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0093_terschelling
-- id = 128770
-- parent_id = 128770
+- id = 129458
+- parent_id = 129458
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0093_terschelling/graph_values.yml b/datasets/GM0093_terschelling/graph_values.yml
index d2df5ec354..0dae9cb1b6 100644
--- a/datasets/GM0093_terschelling/graph_values.yml
+++ b/datasets/GM0093_terschelling/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1498.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14788326233884436
-    :network_gas: 0.1866420571363559
-    :ambient_heat: 0.6654746805247997
+    :electricity: 0.17852531889367973
+    :network_gas: 0.19663488065756274
+    :ambient_heat: 0.6248398004487575
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 2281.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 171.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20641983685600487
-    :network_gas: 0.1743206525759784
-    :ambient_heat: 0.6192595105680168
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad
index b063d39ff6..78b7b70a15 100644
--- a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad
+++ b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0096_vlieland
-- id = 128796
-- parent_id = 128796
+- id = 129484
+- parent_id = 129484
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0096_vlieland/graph_values.yml b/datasets/GM0096_vlieland/graph_values.yml
index 9fca860d1b..3a463544f3 100644
--- a/datasets/GM0096_vlieland/graph_values.yml
+++ b/datasets/GM0096_vlieland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 602.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15311187431156467
-    :network_gas: 0.15788469128639437
-    :ambient_heat: 0.6890034344020409
+    :electricity: 0.18518787906555997
+    :network_gas: 0.1666533156852778
+    :ambient_heat: 0.6481588052491621
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 600.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 45.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21322041208146705
-    :network_gas: 0.14711835167412954
-    :ambient_heat: 0.6396612362444034
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad
index 4759fcddae..b325f2914e 100644
--- a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad
+++ b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0098_weststellingwerf
-- id = 128813
-- parent_id = 128813
+- id = 129501
+- parent_id = 129501
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0098_weststellingwerf/graph_values.yml b/datasets/GM0098_weststellingwerf/graph_values.yml
index b0a38b4ded..fba5eef4df 100644
--- a/datasets/GM0098_weststellingwerf/graph_values.yml
+++ b/datasets/GM0098_weststellingwerf/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2100.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1525745025712722
-    :network_gas: 0.16084023585800308
-    :ambient_heat: 0.6865852615707249
+    :electricity: 0.18450196801402685
+    :network_gas: 0.16973991996744894
+    :ambient_heat: 0.6457581120185242
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11666.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 41.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21252294211932632
-    :network_gas: 0.1499082315226923
-    :ambient_heat: 0.6375688263579813
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0106_assen/GM0106_assen.derived.ad b/datasets/GM0106_assen/GM0106_assen.derived.ad
index e89c26d2b9..c837a31c09 100644
--- a/datasets/GM0106_assen/GM0106_assen.derived.ad
+++ b/datasets/GM0106_assen/GM0106_assen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0106_assen
-- id = 128530
-- parent_id = 128530
+- id = 129218
+- parent_id = 129218
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0106_assen/graph_values.yml b/datasets/GM0106_assen/graph_values.yml
index 16f337f8ed..2009212a32 100644
--- a/datasets/GM0106_assen/graph_values.yml
+++ b/datasets/GM0106_assen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 10273.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1531143790114858
-    :network_gas: 0.15787091543682813
-    :ambient_heat: 0.6890147055516862
+    :electricity: 0.18519107673611573
+    :network_gas: 0.1666389261465639
+    :ambient_heat: 0.6481699971173204
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 32515.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 222.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21322366222058808
-    :network_gas: 0.1471053511176455
-    :ambient_heat: 0.6396709866617665
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad
index c25d0329a3..71240c6196 100644
--- a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad
+++ b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0109_coevorden
-- id = 128566
-- parent_id = 128566
+- id = 129254
+- parent_id = 129254
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0109_coevorden/graph_values.yml b/datasets/GM0109_coevorden/graph_values.yml
index 80ca7bb400..d33201d67d 100644
--- a/datasets/GM0109_coevorden/graph_values.yml
+++ b/datasets/GM0109_coevorden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3598.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15099366759303254
-    :network_gas: 0.16953482823832106
-    :ambient_heat: 0.6794715041686464
+    :electricity: 0.1824857106915142
+    :network_gas: 0.17881309129442527
+    :ambient_heat: 0.6387011980140606
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15491.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 119.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21046919427501
-    :network_gas: 0.15812322289995773
-    :ambient_heat: 0.6314075828250323
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0114_emmen/GM0114_emmen.derived.ad b/datasets/GM0114_emmen/GM0114_emmen.derived.ad
index 9593238300..62305af9bb 100644
--- a/datasets/GM0114_emmen/GM0114_emmen.derived.ad
+++ b/datasets/GM0114_emmen/GM0114_emmen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0114_emmen
-- id = 128599
-- parent_id = 128599
+- id = 129287
+- parent_id = 129287
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0114_emmen/graph_values.yml b/datasets/GM0114_emmen/graph_values.yml
index d11821583c..eee40e277f 100644
--- a/datasets/GM0114_emmen/graph_values.yml
+++ b/datasets/GM0114_emmen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 9327.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1513182484350507
-    :network_gas: 0.16774963360722112
-    :ambient_heat: 0.6809321179577282
+    :electricity: 0.18289950497602372
+    :network_gas: 0.17695101426905846
+    :ambient_heat: 0.6401494807549178
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 49357.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 69.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2108911108417349
-    :network_gas: 0.15643555663305828
-    :ambient_heat: 0.632673332525207
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad
index b53d2e6d0c..1321ca6fa6 100644
--- a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad
+++ b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0118_hoogeveen
-- id = 128645
-- parent_id = 128645
+- id = 129333
+- parent_id = 129333
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0118_hoogeveen/graph_values.yml b/datasets/GM0118_hoogeveen/graph_values.yml
index 1e3a8a03ca..daa7864c67 100644
--- a/datasets/GM0118_hoogeveen/graph_values.yml
+++ b/datasets/GM0118_hoogeveen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5856.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15103361743348642
-    :network_gas: 0.1693151041158248
-    :ambient_heat: 0.6796512784506888
+    :electricity: 0.18253663578648205
+    :network_gas: 0.17858392802923737
+    :ambient_heat: 0.6388794361842806
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 25464.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 168.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2105211309145774
-    :network_gas: 0.1579154763416882
-    :ambient_heat: 0.6315633927437343
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0119_meppel/GM0119_meppel.derived.ad b/datasets/GM0119_meppel/GM0119_meppel.derived.ad
index ab0f7f9a8b..c8997da857 100644
--- a/datasets/GM0119_meppel/GM0119_meppel.derived.ad
+++ b/datasets/GM0119_meppel/GM0119_meppel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0119_meppel
-- id = 128684
-- parent_id = 128684
+- id = 129372
+- parent_id = 129372
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0119_meppel/graph_values.yml b/datasets/GM0119_meppel/graph_values.yml
index 52ab6e1f1d..5f6287bfd1 100644
--- a/datasets/GM0119_meppel/graph_values.yml
+++ b/datasets/GM0119_meppel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4155.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15401295638805543
-    :network_gas: 0.15292873986569505
-    :ambient_heat: 0.6930583037462493
+    :electricity: 0.1863386369106657
+    :network_gas: 0.16147489774827817
+    :ambient_heat: 0.6521864653410562
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16069.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 709.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21438920300827052
-    :network_gas: 0.14244318796691546
-    :ambient_heat: 0.6431676090248138
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0141_almelo/GM0141_almelo.derived.ad b/datasets/GM0141_almelo/GM0141_almelo.derived.ad
index d0f2fd6941..712beb1c3b 100644
--- a/datasets/GM0141_almelo/GM0141_almelo.derived.ad
+++ b/datasets/GM0141_almelo/GM0141_almelo.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0141_almelo
-- id = 128520
-- parent_id = 128520
+- id = 129208
+- parent_id = 129208
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0141_almelo/graph_values.yml b/datasets/GM0141_almelo/graph_values.yml
index e89583bf90..85658aded8 100644
--- a/datasets/GM0141_almelo/graph_values.yml
+++ b/datasets/GM0141_almelo/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8339.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15251660297449546
-    :network_gas: 0.16115868364027505
-    :ambient_heat: 0.6863247133852295
+    :electricity: 0.18442807987096102
+    :network_gas: 0.17007241710141238
+    :ambient_heat: 0.6454995030276265
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 33783.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1759.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21244777266850037
-    :network_gas: 0.1502089093259961
-    :ambient_heat: 0.6373433180055034
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0147_borne/GM0147_borne.derived.ad b/datasets/GM0147_borne/GM0147_borne.derived.ad
index 46647399d6..3b0c5b5d5e 100644
--- a/datasets/GM0147_borne/GM0147_borne.derived.ad
+++ b/datasets/GM0147_borne/GM0147_borne.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0147_borne
-- id = 128554
-- parent_id = 128554
+- id = 129242
+- parent_id = 129242
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0147_borne/graph_values.yml b/datasets/GM0147_borne/graph_values.yml
index 43ca6b1f27..0837c5642a 100644
--- a/datasets/GM0147_borne/graph_values.yml
+++ b/datasets/GM0147_borne/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1645.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15638825488632585
-    :network_gas: 0.13986459812520774
-    :ambient_heat: 0.7037471469884664
+    :electricity: 0.18937570288878097
+    :network_gas: 0.14780808069913728
+    :ambient_heat: 0.6628162164120817
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10095.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 172.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21746570652489663
-    :network_gas: 0.13013717390041113
-    :ambient_heat: 0.6523971195746923
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad
index ebb54f6ec6..db258336ce 100644
--- a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad
+++ b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0148_dalfsen
-- id = 128569
-- parent_id = 128569
+- id = 129257
+- parent_id = 129257
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0148_dalfsen/graph_values.yml b/datasets/GM0148_dalfsen/graph_values.yml
index c75c019777..9e2b6e0ec4 100644
--- a/datasets/GM0148_dalfsen/graph_values.yml
+++ b/datasets/GM0148_dalfsen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2268.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15480743489549723
-    :network_gas: 0.14855910807476538
-    :ambient_heat: 0.6966334570297374
+    :electricity: 0.18735387740563614
+    :network_gas: 0.15690630878589723
+    :ambient_heat: 0.6557398138084667
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12044.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 19.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21541894115190796
-    :network_gas: 0.1383242353923659
-    :ambient_heat: 0.6462568234557262
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0150_deventer/GM0150_deventer.derived.ad b/datasets/GM0150_deventer/GM0150_deventer.derived.ad
index a89da6abc9..aea50b1085 100644
--- a/datasets/GM0150_deventer/GM0150_deventer.derived.ad
+++ b/datasets/GM0150_deventer/GM0150_deventer.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0150_deventer
-- id = 128579
-- parent_id = 128579
+- id = 129267
+- parent_id = 129267
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0150_deventer/graph_values.yml b/datasets/GM0150_deventer/graph_values.yml
index 772a34dcd5..3c54ea27cd 100644
--- a/datasets/GM0150_deventer/graph_values.yml
+++ b/datasets/GM0150_deventer/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 11379.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15454185246175522
-    :network_gas: 0.15001981146034626
-    :ambient_heat: 0.6954383360778986
+    :electricity: 0.1870144323567505
+    :network_gas: 0.15843381375773055
+    :ambient_heat: 0.654551753885519
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 46167.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 4299.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2150747959277229
-    :network_gas: 0.13970081628910622
-    :ambient_heat: 0.6452243877831709
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0153_enschede/GM0153_enschede.derived.ad b/datasets/GM0153_enschede/GM0153_enschede.derived.ad
index 7e6f3657a2..6009b55a9c 100644
--- a/datasets/GM0153_enschede/GM0153_enschede.derived.ad
+++ b/datasets/GM0153_enschede/GM0153_enschede.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0153_enschede
-- id = 128601
-- parent_id = 128601
+- id = 129289
+- parent_id = 129289
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0153_enschede/graph_values.yml b/datasets/GM0153_enschede/graph_values.yml
index 5b7b95a913..7e1bcb48e3 100644
--- a/datasets/GM0153_enschede/graph_values.yml
+++ b/datasets/GM0153_enschede/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 18865.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15639026211737103
-    :network_gas: 0.13985355835445937
-    :ambient_heat: 0.7037561795281697
+    :electricity: 0.18937827155800435
+    :network_gas: 0.14779652167059176
+    :ambient_heat: 0.6628252067714039
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 75890.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 3122.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21746830355625674
-    :network_gas: 0.13012678577497075
-    :ambient_heat: 0.6524049106687725
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad
index dbcb344733..689fda4500 100644
--- a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad
+++ b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0158_haaksbergen
-- id = 128618
-- parent_id = 128618
+- id = 129306
+- parent_id = 129306
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0158_haaksbergen/graph_values.yml b/datasets/GM0158_haaksbergen/graph_values.yml
index 27949eabf3..a9f6bbee5d 100644
--- a/datasets/GM0158_haaksbergen/graph_values.yml
+++ b/datasets/GM0158_haaksbergen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1921.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15522090155281631
-    :network_gas: 0.14628504145951035
-    :ambient_heat: 0.6984940569876734
+    :electricity: 0.18788246585082677
+    :network_gas: 0.15452765727593124
+    :ambient_heat: 0.6575898768732419
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10563.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 30.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21595455482468995
-    :network_gas: 0.13618178070123785
-    :ambient_heat: 0.6478636644740722
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad
index 95573cbfa0..9153bb4d61 100644
--- a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad
+++ b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0160_hardenberg
-- id = 128622
-- parent_id = 128622
+- id = 129310
+- parent_id = 129310
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0160_hardenberg/graph_values.yml b/datasets/GM0160_hardenberg/graph_values.yml
index 0e5545bd58..b6a4699199 100644
--- a/datasets/GM0160_hardenberg/graph_values.yml
+++ b/datasets/GM0160_hardenberg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6106.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15390486099074516
-    :network_gas: 0.15352326455090168
-    :ambient_heat: 0.6925718744583533
+    :electricity: 0.18620055024802326
+    :network_gas: 0.16209628864622372
+    :ambient_heat: 0.6517031611057531
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 25102.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 90.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2142490422851791
-    :network_gas: 0.1430038308592813
-    :ambient_heat: 0.6427471268555396
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad
index 0f0bdffa0d..2837bdfeef 100644
--- a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad
+++ b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0163_hellendoorn
-- id = 128634
-- parent_id = 128634
+- id = 129322
+- parent_id = 129322
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0163_hellendoorn/graph_values.yml b/datasets/GM0163_hellendoorn/graph_values.yml
index a8b82f4ea0..2cebdbf6d8 100644
--- a/datasets/GM0163_hellendoorn/graph_values.yml
+++ b/datasets/GM0163_hellendoorn/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3741.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15501556506619457
-    :network_gas: 0.14741439213592988
-    :ambient_heat: 0.6975700427978756
+    :electricity: 0.18761993756215414
+    :network_gas: 0.155709036316547
+    :ambient_heat: 0.6566710261212988
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14923.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 116.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21568858212337885
-    :network_gas: 0.13724567150648226
-    :ambient_heat: 0.6470657463701388
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad
index f6f67717fd..736f849bf9 100644
--- a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad
+++ b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0164_hengelo
-- id = 128637
-- parent_id = 128637
+- id = 129325
+- parent_id = 129325
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0164_hengelo/graph_values.yml b/datasets/GM0164_hengelo/graph_values.yml
index b2766626c7..23a2fe7941 100644
--- a/datasets/GM0164_hengelo/graph_values.yml
+++ b/datasets/GM0164_hengelo/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 11134.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15373294256402936
-    :network_gas: 0.1544688158978385
-    :ambient_heat: 0.6917982415381321
+    :electricity: 0.18598095505134735
+    :network_gas: 0.1630844684880399
+    :ambient_heat: 0.6509345764606127
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 38880.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1568.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2140260983320579
-    :network_gas: 0.143895606671766
-    :ambient_heat: 0.642078294996176
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0166_kampen/GM0166_kampen.derived.ad b/datasets/GM0166_kampen/GM0166_kampen.derived.ad
index 135d87b47f..8d7eacc1ac 100644
--- a/datasets/GM0166_kampen/GM0166_kampen.derived.ad
+++ b/datasets/GM0166_kampen/GM0166_kampen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0166_kampen
-- id = 128653
-- parent_id = 128653
+- id = 129341
+- parent_id = 129341
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0166_kampen/graph_values.yml b/datasets/GM0166_kampen/graph_values.yml
index 1e7fe06542..8ac6593a5c 100644
--- a/datasets/GM0166_kampen/graph_values.yml
+++ b/datasets/GM0166_kampen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4327.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1534591627052825
-    :network_gas: 0.15597460512094638
-    :ambient_heat: 0.6905662321737712
+    :electricity: 0.18563130654500087
+    :network_gas: 0.16465788908613582
+    :ambient_heat: 0.6497108043688633
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22766.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2705.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21367098992842298
-    :network_gas: 0.14531604028630582
-    :ambient_heat: 0.6410129697852712
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0168_losser/GM0168_losser.derived.ad b/datasets/GM0168_losser/GM0168_losser.derived.ad
index 37727218ba..1a31796969 100644
--- a/datasets/GM0168_losser/GM0168_losser.derived.ad
+++ b/datasets/GM0168_losser/GM0168_losser.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0168_losser
-- id = 128677
-- parent_id = 128677
+- id = 129365
+- parent_id = 129365
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0168_losser/graph_values.yml b/datasets/GM0168_losser/graph_values.yml
index 0e3ca7a551..034839ca20 100644
--- a/datasets/GM0168_losser/graph_values.yml
+++ b/datasets/GM0168_losser/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1537.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15369408300641318
-    :network_gas: 0.15468254346472754
-    :ambient_heat: 0.6916233735288593
+    :electricity: 0.18593132267743148
+    :network_gas: 0.16330781449991802
+    :ambient_heat: 0.6507608628226504
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9852.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 60.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2139757004973277
-    :network_gas: 0.14409719801068696
-    :ambient_heat: 0.6419271014919854
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad
index c34c8b1f19..049997c572 100644
--- a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad
+++ b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0171_noordoostpolder
-- id = 128701
-- parent_id = 128701
+- id = 129389
+- parent_id = 129389
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0171_noordoostpolder/graph_values.yml b/datasets/GM0171_noordoostpolder/graph_values.yml
index 00f61ba6e6..458523b396 100644
--- a/datasets/GM0171_noordoostpolder/graph_values.yml
+++ b/datasets/GM0171_noordoostpolder/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4064.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15595144477259038
-    :network_gas: 0.14226705375075283
-    :ambient_heat: 0.7017815014766567
+    :electricity: 0.18881680264656614
+    :network_gas: 0.15032313549679804
+    :ambient_heat: 0.6608600618566358
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19904.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 90.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21690043478393967
-    :network_gas: 0.13239826086423903
-    :ambient_heat: 0.6507013043518213
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad
index 6c50af95a3..b27e081a14 100644
--- a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad
+++ b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0173_oldenzaal
-- id = 128710
-- parent_id = 128710
+- id = 129398
+- parent_id = 129398
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0173_oldenzaal/graph_values.yml b/datasets/GM0173_oldenzaal/graph_values.yml
index a4ba0ee3ae..c8c3726248 100644
--- a/datasets/GM0173_oldenzaal/graph_values.yml
+++ b/datasets/GM0173_oldenzaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3730.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15400544204843397
-    :network_gas: 0.1529700687336133
-    :ambient_heat: 0.6930244892179528
+    :electricity: 0.18632903735346934
+    :network_gas: 0.16151809581934437
+    :ambient_heat: 0.6521528668271863
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14655.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 254.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2143794600576874
-    :network_gas: 0.14248215976924802
-    :ambient_heat: 0.6431383801730645
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0175_ommen/GM0175_ommen.derived.ad b/datasets/GM0175_ommen/GM0175_ommen.derived.ad
index ab7ebbd5d0..92deff3831 100644
--- a/datasets/GM0175_ommen/GM0175_ommen.derived.ad
+++ b/datasets/GM0175_ommen/GM0175_ommen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0175_ommen
-- id = 128712
-- parent_id = 128712
+- id = 129400
+- parent_id = 129400
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0175_ommen/graph_values.yml b/datasets/GM0175_ommen/graph_values.yml
index 07686601f1..eca9c20df0 100644
--- a/datasets/GM0175_ommen/graph_values.yml
+++ b/datasets/GM0175_ommen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2558.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1541526898188033
-    :network_gas: 0.15216020599658198
-    :ambient_heat: 0.6936871041846149
+    :electricity: 0.1865171556894049
+    :network_gas: 0.16067156205967414
+    :ambient_heat: 0.6528112822509209
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7575.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 28.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2145703668549414
-    :network_gas: 0.141718532580232
-    :ambient_heat: 0.6437111005648265
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0177_raalte/GM0177_raalte.derived.ad b/datasets/GM0177_raalte/GM0177_raalte.derived.ad
index 8287e762af..586028945d 100644
--- a/datasets/GM0177_raalte/GM0177_raalte.derived.ad
+++ b/datasets/GM0177_raalte/GM0177_raalte.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0177_raalte
-- id = 128730
-- parent_id = 128730
+- id = 129418
+- parent_id = 129418
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0177_raalte/graph_values.yml b/datasets/GM0177_raalte/graph_values.yml
index 7a2b1854ae..fcab4f7ec5 100644
--- a/datasets/GM0177_raalte/graph_values.yml
+++ b/datasets/GM0177_raalte/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3286.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1548782675729321
-    :network_gas: 0.14816952834887345
-    :ambient_heat: 0.6969522040781945
+    :electricity: 0.18744442080944587
+    :network_gas: 0.15649886286809656
+    :ambient_heat: 0.6560567163224575
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16027.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 43.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21551071332920324
-    :network_gas: 0.13795714668318473
-    :ambient_heat: 0.646532139987612
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad
index c407824962..c919af692b 100644
--- a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad
+++ b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0180_staphorst
-- id = 128762
-- parent_id = 128762
+- id = 129450
+- parent_id = 129450
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0180_staphorst/graph_values.yml b/datasets/GM0180_staphorst/graph_values.yml
index 0f39653fba..c92a08dbf7 100644
--- a/datasets/GM0180_staphorst/graph_values.yml
+++ b/datasets/GM0180_staphorst/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1335.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1530377740416969
-    :network_gas: 0.15829224277066692
-    :ambient_heat: 0.6886699831876362
+    :electricity: 0.18509328024146185
+    :network_gas: 0.16707901102127956
+    :ambient_heat: 0.6478277087372587
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5945.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 25.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21312425509239127
-    :network_gas: 0.14750297963043268
-    :ambient_heat: 0.6393727652771761
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad
index e22dde9fb3..499b2b5917 100644
--- a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad
+++ b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0183_tubbergen
-- id = 128776
-- parent_id = 128776
+- id = 129464
+- parent_id = 129464
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0183_tubbergen/graph_values.yml b/datasets/GM0183_tubbergen/graph_values.yml
index 22ae7ca57a..68dbb392ce 100644
--- a/datasets/GM0183_tubbergen/graph_values.yml
+++ b/datasets/GM0183_tubbergen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1288.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1547819021617863
-    :network_gas: 0.14869953811017556
-    :ambient_heat: 0.6965185597280383
+    :electricity: 0.18732124077739004
+    :network_gas: 0.15705317382951314
+    :ambient_heat: 0.6556255853930968
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8606.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 15.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21538585903302582
-    :network_gas: 0.13845656386789437
-    :ambient_heat: 0.6461575770990797
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0184_urk/GM0184_urk.derived.ad b/datasets/GM0184_urk/GM0184_urk.derived.ad
index 7915def4ef..87621fc9e4 100644
--- a/datasets/GM0184_urk/GM0184_urk.derived.ad
+++ b/datasets/GM0184_urk/GM0184_urk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0184_urk
-- id = 128782
-- parent_id = 128782
+- id = 129470
+- parent_id = 129470
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0184_urk/graph_values.yml b/datasets/GM0184_urk/graph_values.yml
index cfcb061234..900d3c2601 100644
--- a/datasets/GM0184_urk/graph_values.yml
+++ b/datasets/GM0184_urk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1413.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15759412227801017
-    :network_gas: 0.133232327470944
-    :ambient_heat: 0.7091735502510458
+    :electricity: 0.19091953575106665
+    :network_gas: 0.14086082257720364
+    :ambient_heat: 0.6682196416717296
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6753.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 258.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.219025068464226
-    :network_gas: 0.12389972614309368
-    :ambient_heat: 0.6570752053926803
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0189_wierden/GM0189_wierden.derived.ad b/datasets/GM0189_wierden/GM0189_wierden.derived.ad
index fa08524e75..38dc5b4def 100644
--- a/datasets/GM0189_wierden/GM0189_wierden.derived.ad
+++ b/datasets/GM0189_wierden/GM0189_wierden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0189_wierden
-- id = 128814
-- parent_id = 128814
+- id = 129502
+- parent_id = 129502
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0189_wierden/graph_values.yml b/datasets/GM0189_wierden/graph_values.yml
index 5c2a3066e8..4142ba4882 100644
--- a/datasets/GM0189_wierden/graph_values.yml
+++ b/datasets/GM0189_wierden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2045.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15624611517308687
-    :network_gas: 0.14064636654802212
-    :ambient_heat: 0.703107518278891
+    :electricity: 0.18919381511073088
+    :network_gas: 0.1486265769069899
+    :ambient_heat: 0.6621796079822792
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9929.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 30.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2172817890038148
-    :network_gas: 0.13087284398473847
-    :ambient_heat: 0.6518453670114467
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad
index 80476b2d3f..2e049664fa 100644
--- a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad
+++ b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0193_zwolle
-- id = 128836
-- parent_id = 128836
+- id = 129524
+- parent_id = 129524
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0193_zwolle/graph_values.yml b/datasets/GM0193_zwolle/graph_values.yml
index 83f8ee1f01..2b9597f41b 100644
--- a/datasets/GM0193_zwolle/graph_values.yml
+++ b/datasets/GM0193_zwolle/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 22273.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15511241250600608
-    :network_gas: 0.14688173121696674
-    :ambient_heat: 0.6980058562770274
+    :electricity: 0.18774375477453448
+    :network_gas: 0.15515185803944342
+    :ambient_heat: 0.657104387186022
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 59462.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 4931.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2158140348332163
-    :network_gas: 0.1367438606671325
-    :ambient_heat: 0.6474421044996512
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0197_aalten/GM0197_aalten.derived.ad b/datasets/GM0197_aalten/GM0197_aalten.derived.ad
index ee594757ce..89741e5eae 100644
--- a/datasets/GM0197_aalten/GM0197_aalten.derived.ad
+++ b/datasets/GM0197_aalten/GM0197_aalten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0197_aalten
-- id = 128515
-- parent_id = 128515
+- id = 129203
+- parent_id = 129203
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0197_aalten/graph_values.yml b/datasets/GM0197_aalten/graph_values.yml
index e424daa696..1f2900f112 100644
--- a/datasets/GM0197_aalten/graph_values.yml
+++ b/datasets/GM0197_aalten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1913.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15448905980557054
-    :network_gas: 0.15031017106936193
-    :ambient_heat: 0.6952007691250675
+    :electricity: 0.18694696503605324
+    :network_gas: 0.15873741714844036
+    :ambient_heat: 0.6543156178155065
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12023.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 102.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21500637681269735
-    :network_gas: 0.13997449274920828
-    :ambient_heat: 0.6450191304380944
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad
index e64f528841..1f4aa9a70a 100644
--- a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad
+++ b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0200_apeldoorn
-- id = 128528
-- parent_id = 128528
+- id = 129216
+- parent_id = 129216
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0200_apeldoorn/graph_values.yml b/datasets/GM0200_apeldoorn/graph_values.yml
index e8c72991a7..ffcfd4d3ad 100644
--- a/datasets/GM0200_apeldoorn/graph_values.yml
+++ b/datasets/GM0200_apeldoorn/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 27746.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15315063143038715
-    :network_gas: 0.15767152713287066
-    :ambient_heat: 0.6891778414367422
+    :electricity: 0.18523735969449714
+    :network_gas: 0.1664306525268105
+    :ambient_heat: 0.6483319877786924
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 73999.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 532.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21327070313360816
-    :network_gas: 0.14691718746556498
-    :ambient_heat: 0.6398121094008268
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad
index 906fee923c..b390593573 100644
--- a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad
+++ b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0202_arnhem
-- id = 128529
-- parent_id = 128529
+- id = 129217
+- parent_id = 129217
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0202_arnhem/graph_values.yml b/datasets/GM0202_arnhem/graph_values.yml
index 78d070927f..e75d638bc8 100644
--- a/datasets/GM0202_arnhem/graph_values.yml
+++ b/datasets/GM0202_arnhem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 25410.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15481842838941792
-    :network_gas: 0.14849864385820133
-    :ambient_heat: 0.6966829277523806
+    :electricity: 0.18736792977209588
+    :network_gas: 0.15684307304360634
+    :ambient_heat: 0.6557889971842978
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 77777.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 5344.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2154331849130769
-    :network_gas: 0.13826726034769002
-    :ambient_heat: 0.646299554739233
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad
index 7189a9f6cb..babec2a1cf 100644
--- a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad
+++ b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0203_barneveld
-- id = 128535
-- parent_id = 128535
+- id = 129223
+- parent_id = 129223
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0203_barneveld/graph_values.yml b/datasets/GM0203_barneveld/graph_values.yml
index faf620de99..8247a524e6 100644
--- a/datasets/GM0203_barneveld/graph_values.yml
+++ b/datasets/GM0203_barneveld/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 7661.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15590873201385183
-    :network_gas: 0.14250197392381492
-    :ambient_heat: 0.7015892940623333
+    :electricity: 0.18876216102087054
+    :network_gas: 0.15056902317491583
+    :ambient_heat: 0.6606688158042137
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 23121.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 63.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21684514882630962
-    :network_gas: 0.13261940469475914
-    :ambient_heat: 0.6505354464789311
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad
index 29f3f7ca24..4ee77422dc 100644
--- a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad
+++ b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0209_beuningen
-- id = 128546
-- parent_id = 128546
+- id = 129234
+- parent_id = 129234
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0209_beuningen/graph_values.yml b/datasets/GM0209_beuningen/graph_values.yml
index eeeaf793c9..46304b6bca 100644
--- a/datasets/GM0209_beuningen/graph_values.yml
+++ b/datasets/GM0209_beuningen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2384.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15504299944558594
-    :network_gas: 0.1472635030492772
-    :ambient_heat: 0.6976934975051369
+    :electricity: 0.18765501089811365
+    :network_gas: 0.15555120607205586
+    :ambient_heat: 0.6567937830298304
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11232.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 13.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.215724120734943
-    :network_gas: 0.13710351706022572
-    :ambient_heat: 0.6471723622048312
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0213_brummen/GM0213_brummen.derived.ad b/datasets/GM0213_brummen/GM0213_brummen.derived.ad
index c0bd71e557..26461b056a 100644
--- a/datasets/GM0213_brummen/GM0213_brummen.derived.ad
+++ b/datasets/GM0213_brummen/GM0213_brummen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0213_brummen
-- id = 128559
-- parent_id = 128559
+- id = 129247
+- parent_id = 129247
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0213_brummen/graph_values.yml b/datasets/GM0213_brummen/graph_values.yml
index 068657b139..547cc70af5 100644
--- a/datasets/GM0213_brummen/graph_values.yml
+++ b/datasets/GM0213_brummen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1574.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1499776586617623
-    :network_gas: 0.1751228773603074
-    :ambient_heat: 0.6748994639779303
+    :electricity: 0.1811910733344621
+    :network_gas: 0.1846389679896672
+    :ambient_heat: 0.6341699586758707
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9407.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 34.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20914771363635168
-    :network_gas: 0.1634091454545911
-    :ambient_heat: 0.6274431409090573
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0214_buren/GM0214_buren.derived.ad b/datasets/GM0214_buren/GM0214_buren.derived.ad
index 4120e8cf52..cf2daa4c80 100644
--- a/datasets/GM0214_buren/GM0214_buren.derived.ad
+++ b/datasets/GM0214_buren/GM0214_buren.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0214_buren
-- id = 128563
-- parent_id = 128563
+- id = 129251
+- parent_id = 129251
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0214_buren/graph_values.yml b/datasets/GM0214_buren/graph_values.yml
index 08b2d7a74e..34f4612654 100644
--- a/datasets/GM0214_buren/graph_values.yml
+++ b/datasets/GM0214_buren/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1695.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15633516869703032
-    :network_gas: 0.14015657216633312
-    :ambient_heat: 0.7035082591366364
+    :electricity: 0.1893077694375055
+    :network_gas: 0.14811378168054143
+    :ambient_heat: 0.662578448881953
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10903.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 99.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21739701992467608
-    :network_gas: 0.1304119203012933
-    :ambient_heat: 0.6521910597740306
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad
index 184894c9db..8a15bed7a4 100644
--- a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad
+++ b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0216_culemborg
-- id = 128568
-- parent_id = 128568
+- id = 129256
+- parent_id = 129256
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0216_culemborg/graph_values.yml b/datasets/GM0216_culemborg/graph_values.yml
index 0c5bc57111..db65e6de03 100644
--- a/datasets/GM0216_culemborg/graph_values.yml
+++ b/datasets/GM0216_culemborg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3085.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15805370936614216
-    :network_gas: 0.13070459848621804
-    :ambient_heat: 0.7112416921476397
+    :electricity: 0.1915082862680981
+    :network_gas: 0.13821144134484445
+    :ambient_heat: 0.6702802723870576
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12720.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 713.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2196189415615075
-    :network_gas: 0.12152423375396754
-    :ambient_heat: 0.6588568246845249
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad
index 9d32fa8f67..de66b2325c 100644
--- a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad
+++ b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0221_doesburg
-- id = 128582
-- parent_id = 128582
+- id = 129270
+- parent_id = 129270
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0221_doesburg/graph_values.yml b/datasets/GM0221_doesburg/graph_values.yml
index 6c4eb92eda..4877ebab90 100644
--- a/datasets/GM0221_doesburg/graph_values.yml
+++ b/datasets/GM0221_doesburg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 845.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15452489726223206
-    :network_gas: 0.15011306505772368
-    :ambient_heat: 0.6953620376800443
+    :electricity: 0.18699276387396918
+    :network_gas: 0.15853132207399323
+    :ambient_heat: 0.6544759140520375
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5307.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 362.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21505282239340234
-    :network_gas: 0.13978871042638835
-    :ambient_heat: 0.6451584671802093
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad
index e2eed5bc94..e05a7d7b98 100644
--- a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad
+++ b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0222_doetinchem
-- id = 128583
-- parent_id = 128583
+- id = 129271
+- parent_id = 129271
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0222_doetinchem/graph_values.yml b/datasets/GM0222_doetinchem/graph_values.yml
index 1235b3cef7..ff501782a4 100644
--- a/datasets/GM0222_doetinchem/graph_values.yml
+++ b/datasets/GM0222_doetinchem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8530.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15545691098416334
-    :network_gas: 0.14498698958710154
-    :ambient_heat: 0.6995560994287351
+    :electricity: 0.1881842586815566
+    :network_gas: 0.1531695875355805
+    :ambient_heat: 0.6586461537828628
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 26492.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 156.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2162601982168071
-    :network_gas: 0.1349592071327692
-    :ambient_heat: 0.6487805946504236
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0225_druten/GM0225_druten.derived.ad b/datasets/GM0225_druten/GM0225_druten.derived.ad
index d6f2a4ba4c..338aec441f 100644
--- a/datasets/GM0225_druten/GM0225_druten.derived.ad
+++ b/datasets/GM0225_druten/GM0225_druten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0225_druten
-- id = 128589
-- parent_id = 128589
+- id = 129277
+- parent_id = 129277
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0225_druten/graph_values.yml b/datasets/GM0225_druten/graph_values.yml
index b4470f8f25..1ca4b6211e 100644
--- a/datasets/GM0225_druten/graph_values.yml
+++ b/datasets/GM0225_druten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1716.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15673993273283118
-    :network_gas: 0.13793036996942865
-    :ambient_heat: 0.7053296972977402
+    :electricity: 0.1898258049287775
+    :network_gas: 0.14578261853321667
+    :ambient_heat: 0.6643915765380058
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8189.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 21.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2179206498631967
-    :network_gas: 0.1283174005472108
-    :ambient_heat: 0.6537619495895924
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0226_duiven/GM0226_duiven.derived.ad b/datasets/GM0226_duiven/GM0226_duiven.derived.ad
index 7c933bb6fa..02efbc82ca 100644
--- a/datasets/GM0226_duiven/GM0226_duiven.derived.ad
+++ b/datasets/GM0226_duiven/GM0226_duiven.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0226_duiven
-- id = 128590
-- parent_id = 128590
+- id = 129278
+- parent_id = 129278
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0226_duiven/graph_values.yml b/datasets/GM0226_duiven/graph_values.yml
index 2b9d19313e..c79df12689 100644
--- a/datasets/GM0226_duiven/graph_values.yml
+++ b/datasets/GM0226_duiven/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2691.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.16945907791798914
-    :network_gas: 0.06797507145105981
-    :ambient_heat: 0.7625658506309511
+    :electricity: 0.20618230262562615
+    :network_gas: 0.07217827038986606
+    :ambient_heat: 0.7216394269845079
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10750.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.23427951021924712
-    :network_gas: 0.0628819591230091
-    :ambient_heat: 0.7028385306577438
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0228_ede/GM0228_ede.derived.ad b/datasets/GM0228_ede/GM0228_ede.derived.ad
index 8a3b47f56a..bab11597bf 100644
--- a/datasets/GM0228_ede/GM0228_ede.derived.ad
+++ b/datasets/GM0228_ede/GM0228_ede.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0228_ede
-- id = 128593
-- parent_id = 128593
+- id = 129281
+- parent_id = 129281
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0228_ede/graph_values.yml b/datasets/GM0228_ede/graph_values.yml
index c78dd93e7f..8ba9552f2a 100644
--- a/datasets/GM0228_ede/graph_values.yml
+++ b/datasets/GM0228_ede/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 12867.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15705656136390492
-    :network_gas: 0.13618891249852297
-    :ambient_heat: 0.7067545261375721
+    :electricity: 0.19023114689560597
+    :network_gas: 0.14395857699348646
+    :ambient_heat: 0.6658102761109076
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 49897.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 203.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21833013055190587
-    :network_gas: 0.12667947779237418
-    :ambient_heat: 0.65499039165572
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0230_elburg/GM0230_elburg.derived.ad b/datasets/GM0230_elburg/GM0230_elburg.derived.ad
index fc9f4d58c4..9e4d0d7685 100644
--- a/datasets/GM0230_elburg/GM0230_elburg.derived.ad
+++ b/datasets/GM0230_elburg/GM0230_elburg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0230_elburg
-- id = 128598
-- parent_id = 128598
+- id = 129286
+- parent_id = 129286
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0230_elburg/graph_values.yml b/datasets/GM0230_elburg/graph_values.yml
index deb3f88ae1..6424987a0d 100644
--- a/datasets/GM0230_elburg/graph_values.yml
+++ b/datasets/GM0230_elburg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2484.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15526817291625103
-    :network_gas: 0.14602504896061935
-    :ambient_heat: 0.6987067781231296
+    :electricity: 0.18794290911813447
+    :network_gas: 0.15425566217207137
+    :ambient_heat: 0.6578014287097941
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9583.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 304.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21601577862030946
-    :network_gas: 0.13593688551875996
-    :ambient_heat: 0.6480473358609307
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0232_epe/GM0232_epe.derived.ad b/datasets/GM0232_epe/GM0232_epe.derived.ad
index fa9b9a0c45..1e2496bf16 100644
--- a/datasets/GM0232_epe/GM0232_epe.derived.ad
+++ b/datasets/GM0232_epe/GM0232_epe.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0232_epe
-- id = 128602
-- parent_id = 128602
+- id = 129290
+- parent_id = 129290
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0232_epe/graph_values.yml b/datasets/GM0232_epe/graph_values.yml
index 72b105a11d..7a9443ca9a 100644
--- a/datasets/GM0232_epe/graph_values.yml
+++ b/datasets/GM0232_epe/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2890.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1526932322389113
-    :network_gas: 0.16018722268598795
-    :ambient_heat: 0.6871195450751008
+    :electricity: 0.18465349370897624
+    :network_gas: 0.1690580533349688
+    :ambient_heat: 0.6462884529560549
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14683.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 26.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21267707344675765
-    :network_gas: 0.14929170621296706
-    :ambient_heat: 0.6380312203402753
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad
index 00cb3c5432..8a1eb46108 100644
--- a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad
+++ b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0233_ermelo
-- id = 128603
-- parent_id = 128603
+- id = 129291
+- parent_id = 129291
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0233_ermelo/graph_values.yml b/datasets/GM0233_ermelo/graph_values.yml
index 8563faabcc..82400f798b 100644
--- a/datasets/GM0233_ermelo/graph_values.yml
+++ b/datasets/GM0233_ermelo/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3957.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15264414565553097
-    :network_gas: 0.16045719889457957
-    :ambient_heat: 0.6868986554498894
+    :electricity: 0.1845908466329083
+    :network_gas: 0.16933996559286965
+    :ambient_heat: 0.6460691877742221
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11332.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 27.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21261335267931494
-    :network_gas: 0.149546589282738
-    :ambient_heat: 0.6378400580379472
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad
index 76d836a7de..8da936db7b 100644
--- a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad
+++ b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0243_harderwijk
-- id = 128623
-- parent_id = 128623
+- id = 129311
+- parent_id = 129311
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0243_harderwijk/graph_values.yml b/datasets/GM0243_harderwijk/graph_values.yml
index 98a0cc8b59..566612c102 100644
--- a/datasets/GM0243_harderwijk/graph_values.yml
+++ b/datasets/GM0243_harderwijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4652.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1547546617687888
-    :network_gas: 0.14884936027166168
-    :ambient_heat: 0.6963959779595496
+    :electricity: 0.18728642203995133
+    :network_gas: 0.15720985837897164
+    :ambient_heat: 0.655503719581077
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20668.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 428.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2153505635141489
-    :network_gas: 0.13859774594340216
-    :ambient_heat: 0.6460516905424489
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0244_hattem/GM0244_hattem.derived.ad b/datasets/GM0244_hattem/GM0244_hattem.derived.ad
index c8bb27a2a8..754baa9bb6 100644
--- a/datasets/GM0244_hattem/GM0244_hattem.derived.ad
+++ b/datasets/GM0244_hattem/GM0244_hattem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0244_hattem
-- id = 128626
-- parent_id = 128626
+- id = 129314
+- parent_id = 129314
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0244_hattem/graph_values.yml b/datasets/GM0244_hattem/graph_values.yml
index 6f5629ef41..e01f0dc5d2 100644
--- a/datasets/GM0244_hattem/graph_values.yml
+++ b/datasets/GM0244_hattem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 908.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15393733585371644
-    :network_gas: 0.15334465280455947
-    :ambient_heat: 0.6927180113417241
+    :electricity: 0.18624203418274765
+    :network_gas: 0.1619096106647631
+    :ambient_heat: 0.6518483551524892
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5259.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 226.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21429115188123868
-    :network_gas: 0.14283539247504293
-    :ambient_heat: 0.6428734556437183
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0246_heerde/GM0246_heerde.derived.ad b/datasets/GM0246_heerde/GM0246_heerde.derived.ad
index 58207b734d..0fa9ac2d83 100644
--- a/datasets/GM0246_heerde/GM0246_heerde.derived.ad
+++ b/datasets/GM0246_heerde/GM0246_heerde.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0246_heerde
-- id = 128629
-- parent_id = 128629
+- id = 129317
+- parent_id = 129317
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0246_heerde/graph_values.yml b/datasets/GM0246_heerde/graph_values.yml
index f83720a068..66a1783b62 100644
--- a/datasets/GM0246_heerde/graph_values.yml
+++ b/datasets/GM0246_heerde/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1290.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1544312994273947
-    :network_gas: 0.1506278531493292
-    :ambient_heat: 0.6949408474232761
+    :electricity: 0.1868731520875415
+    :network_gas: 0.1590695759064117
+    :ambient_heat: 0.6540572720060469
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8005.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 11.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2149315158621545
-    :network_gas: 0.14027393655137974
-    :ambient_heat: 0.6447945475864657
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0252_heumen/GM0252_heumen.derived.ad b/datasets/GM0252_heumen/GM0252_heumen.derived.ad
index a516cd00f5..4e04878aa5 100644
--- a/datasets/GM0252_heumen/GM0252_heumen.derived.ad
+++ b/datasets/GM0252_heumen/GM0252_heumen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0252_heumen
-- id = 128638
-- parent_id = 128638
+- id = 129326
+- parent_id = 129326
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0252_heumen/graph_values.yml b/datasets/GM0252_heumen/graph_values.yml
index abe78223cc..347a5c6531 100644
--- a/datasets/GM0252_heumen/graph_values.yml
+++ b/datasets/GM0252_heumen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 959.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15567626871158613
-    :network_gas: 0.14378052208627629
-    :ambient_heat: 0.7005432092021376
+    :electricity: 0.1884648048189953
+    :network_gas: 0.1519071280559885
+    :ambient_heat: 0.6596280671250162
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7265.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 7.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21654421931649798
-    :network_gas: 0.13382312273400584
-    :ambient_heat: 0.6496326579494963
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0262_lochem/GM0262_lochem.derived.ad b/datasets/GM0262_lochem/GM0262_lochem.derived.ad
index bbdd0e3007..3f90d1ec1c 100644
--- a/datasets/GM0262_lochem/GM0262_lochem.derived.ad
+++ b/datasets/GM0262_lochem/GM0262_lochem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0262_lochem
-- id = 128674
-- parent_id = 128674
+- id = 129362
+- parent_id = 129362
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0262_lochem/graph_values.yml b/datasets/GM0262_lochem/graph_values.yml
index b130975924..2719047a32 100644
--- a/datasets/GM0262_lochem/graph_values.yml
+++ b/datasets/GM0262_lochem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3215.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15063014675955463
-    :network_gas: 0.17153419282244964
-    :ambient_heat: 0.6778356604179958
+    :electricity: 0.18202238903859155
+    :network_gas: 0.18089804180621127
+    :ambient_heat: 0.6370795691551971
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15122.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 85.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20999651536926575
-    :network_gas: 0.16001393852293475
-    :ambient_heat: 0.6299895461077996
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad
index b3a3e4e9e8..cf0021c240 100644
--- a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad
+++ b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0263_maasdriel
-- id = 128678
-- parent_id = 128678
+- id = 129366
+- parent_id = 129366
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0263_maasdriel/graph_values.yml b/datasets/GM0263_maasdriel/graph_values.yml
index d5634faff8..5b041709a9 100644
--- a/datasets/GM0263_maasdriel/graph_values.yml
+++ b/datasets/GM0263_maasdriel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1460.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15667544721037907
-    :network_gas: 0.13828504034291514
-    :ambient_heat: 0.7050395124467058
+    :electricity: 0.18974326321329116
+    :network_gas: 0.14615405680047938
+    :ambient_heat: 0.6641026799862294
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10195.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 60.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21783723968347382
-    :network_gas: 0.12865104126610236
-    :ambient_heat: 0.6535117190504238
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad
index 002281eadc..caf3aadfc3 100644
--- a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad
+++ b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0267_nijkerk
-- id = 128696
-- parent_id = 128696
+- id = 129384
+- parent_id = 129384
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0267_nijkerk/graph_values.yml b/datasets/GM0267_nijkerk/graph_values.yml
index 8e0205efc3..3475a8de7c 100644
--- a/datasets/GM0267_nijkerk/graph_values.yml
+++ b/datasets/GM0267_nijkerk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4728.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1561516240274299
-    :network_gas: 0.1411660678491355
-    :ambient_heat: 0.7026823081234346
+    :electricity: 0.1890729107743081
+    :network_gas: 0.14917064722296086
+    :ambient_heat: 0.661756442002731
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 17338.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 337.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21715951208421094
-    :network_gas: 0.13136195166315395
-    :ambient_heat: 0.6514785362526352
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad
index 16a0042837..7bb1de4c86 100644
--- a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad
+++ b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0268_nijmegen
-- id = 128697
-- parent_id = 128697
+- id = 129385
+- parent_id = 129385
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0268_nijmegen/graph_values.yml b/datasets/GM0268_nijmegen/graph_values.yml
index 5fa91908bf..784247871d 100644
--- a/datasets/GM0268_nijmegen/graph_values.yml
+++ b/datasets/GM0268_nijmegen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 24758.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15401649605867546
-    :network_gas: 0.15290927167728494
-    :ambient_heat: 0.6930742322640396
+    :electricity: 0.18634315885252264
+    :network_gas: 0.1614545489799238
+    :ambient_heat: 0.6522022921675535
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 82196.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 5934.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2143937924556412
-    :network_gas: 0.14242483017743313
-    :ambient_heat: 0.6431813773669258
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad
index b0d56dc806..b7e9ea7e7d 100644
--- a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad
+++ b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0269_oldebroek
-- id = 128709
-- parent_id = 128709
+- id = 129397
+- parent_id = 129397
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0269_oldebroek/graph_values.yml b/datasets/GM0269_oldebroek/graph_values.yml
index 84e1e74478..8ef58bc3c9 100644
--- a/datasets/GM0269_oldebroek/graph_values.yml
+++ b/datasets/GM0269_oldebroek/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1605.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1544294637351701
-    :network_gas: 0.15063794945656442
-    :ambient_heat: 0.6949325868082654
+    :electricity: 0.18687080627663363
+    :network_gas: 0.15908013207105892
+    :ambient_heat: 0.6540490616523075
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9451.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 18.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21492913663067245
-    :network_gas: 0.1402834534773079
-    :ambient_heat: 0.6447874098920197
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0273_putten/GM0273_putten.derived.ad b/datasets/GM0273_putten/GM0273_putten.derived.ad
index 1d8c66d311..dcd679cb10 100644
--- a/datasets/GM0273_putten/GM0273_putten.derived.ad
+++ b/datasets/GM0273_putten/GM0273_putten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0273_putten
-- id = 128729
-- parent_id = 128729
+- id = 129417
+- parent_id = 129417
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0273_putten/graph_values.yml b/datasets/GM0273_putten/graph_values.yml
index ecd89037fb..c8be9ce517 100644
--- a/datasets/GM0273_putten/graph_values.yml
+++ b/datasets/GM0273_putten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2683.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15569744433287538
-    :network_gas: 0.1436640561691856
-    :ambient_heat: 0.7006384994979392
+    :electricity: 0.18849188960710542
+    :network_gas: 0.15178524632981513
+    :ambient_heat: 0.6597228640630796
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9898.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 18.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21657163425996562
-    :network_gas: 0.13371346296013525
-    :ambient_heat: 0.6497149027798992
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0274_renkum/GM0274_renkum.derived.ad b/datasets/GM0274_renkum/GM0274_renkum.derived.ad
index 079dcbb791..f67b387401 100644
--- a/datasets/GM0274_renkum/GM0274_renkum.derived.ad
+++ b/datasets/GM0274_renkum/GM0274_renkum.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0274_renkum
-- id = 128732
-- parent_id = 128732
+- id = 129420
+- parent_id = 129420
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0274_renkum/graph_values.yml b/datasets/GM0274_renkum/graph_values.yml
index 1079652c4e..960af97574 100644
--- a/datasets/GM0274_renkum/graph_values.yml
+++ b/datasets/GM0274_renkum/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2150.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15038631665438176
-    :network_gas: 0.17287525840090032
-    :ambient_heat: 0.6767384249447179
+    :electricity: 0.18171168634038537
+    :network_gas: 0.1822962060093127
+    :ambient_heat: 0.6359921076503018
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14987.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 422.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20967938207179979
-    :network_gas: 0.1612824717127987
-    :ambient_heat: 0.6290381462154016
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0275_rheden/GM0275_rheden.derived.ad b/datasets/GM0275_rheden/GM0275_rheden.derived.ad
index 41e755b489..94f27465d4 100644
--- a/datasets/GM0275_rheden/GM0275_rheden.derived.ad
+++ b/datasets/GM0275_rheden/GM0275_rheden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0275_rheden
-- id = 128735
-- parent_id = 128735
+- id = 129423
+- parent_id = 129423
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0275_rheden/graph_values.yml b/datasets/GM0275_rheden/graph_values.yml
index 6989a54f28..abb3ef935b 100644
--- a/datasets/GM0275_rheden/graph_values.yml
+++ b/datasets/GM0275_rheden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3994.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1497403479071092
-    :network_gas: 0.17642808651089947
-    :ambient_heat: 0.6738315655819913
+    :electricity: 0.1808888202172389
+    :network_gas: 0.18599910902229158
+    :ambient_heat: 0.6331120707604695
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 21217.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 577.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20883888083965343
-    :network_gas: 0.164644476641384
-    :ambient_heat: 0.6265166425189624
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad
index 12a922df70..935f2e32c7 100644
--- a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad
+++ b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0277_rozendaal
-- id = 128744
-- parent_id = 128744
+- id = 129432
+- parent_id = 129432
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0277_rozendaal/graph_values.yml b/datasets/GM0277_rozendaal/graph_values.yml
index 3b7caef094..c838fa3f7d 100644
--- a/datasets/GM0277_rozendaal/graph_values.yml
+++ b/datasets/GM0277_rozendaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 185.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15467339009118963
-    :network_gas: 0.14929635449845702
-    :ambient_heat: 0.6960302554103533
+    :electricity: 0.18718254447257499
+    :network_gas: 0.1576773081212795
+    :ambient_heat: 0.6551401474061455
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 694.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 7.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2152452542932283
-    :network_gas: 0.1390189828270846
-    :ambient_heat: 0.6457357628796871
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad
index b6c6a9616a..47c7b34c18 100644
--- a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad
+++ b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0279_scherpenzeel
-- id = 128747
-- parent_id = 128747
+- id = 129435
+- parent_id = 129435
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0279_scherpenzeel/graph_values.yml b/datasets/GM0279_scherpenzeel/graph_values.yml
index 191322ac3c..5cac6e68c3 100644
--- a/datasets/GM0279_scherpenzeel/graph_values.yml
+++ b/datasets/GM0279_scherpenzeel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 812.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1550816422335736
-    :network_gas: 0.14705096771534523
-    :ambient_heat: 0.6978673900510811
+    :electricity: 0.18770441474917743
+    :network_gas: 0.15532888841452844
+    :ambient_heat: 0.6569666968362943
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4112.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 68.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2157741772947494
-    :network_gas: 0.13690329082100003
-    :ambient_heat: 0.6473225318842505
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0281_tiel/GM0281_tiel.derived.ad b/datasets/GM0281_tiel/GM0281_tiel.derived.ad
index 5aad2a7a52..b51e456659 100644
--- a/datasets/GM0281_tiel/GM0281_tiel.derived.ad
+++ b/datasets/GM0281_tiel/GM0281_tiel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0281_tiel
-- id = 128774
-- parent_id = 128774
+- id = 129462
+- parent_id = 129462
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0281_tiel/graph_values.yml b/datasets/GM0281_tiel/graph_values.yml
index 5d8a87e682..79979c2dbd 100644
--- a/datasets/GM0281_tiel/graph_values.yml
+++ b/datasets/GM0281_tiel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5216.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1554220863868968
-    :network_gas: 0.14517852487206767
-    :ambient_heat: 0.6993993887410356
+    :electricity: 0.18813972409947843
+    :network_gas: 0.15336999345037072
+    :ambient_heat: 0.6584902824501507
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18255.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 980.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21621510275071093
-    :network_gas: 0.13513958899715392
-    :ambient_heat: 0.6486453082521351
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0285_voorst/GM0285_voorst.derived.ad b/datasets/GM0285_voorst/GM0285_voorst.derived.ad
index 8bcf97f80e..08e2c69b20 100644
--- a/datasets/GM0285_voorst/GM0285_voorst.derived.ad
+++ b/datasets/GM0285_voorst/GM0285_voorst.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0285_voorst
-- id = 128800
-- parent_id = 128800
+- id = 129488
+- parent_id = 129488
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0285_voorst/graph_values.yml b/datasets/GM0285_voorst/graph_values.yml
index 0f83a0b66b..277b1651bc 100644
--- a/datasets/GM0285_voorst/graph_values.yml
+++ b/datasets/GM0285_voorst/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2787.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15305558473177316
-    :network_gas: 0.15819428397524746
-    :ambient_heat: 0.6887501312929792
+    :electricity: 0.18511601748573672
+    :network_gas: 0.16697669327120565
+    :ambient_heat: 0.6479072892430576
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10715.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 40.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21314736789980698
-    :network_gas: 0.1474105284007697
-    :ambient_heat: 0.6394421036994233
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad
index 24348e3686..a8d60aad07 100644
--- a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad
+++ b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0289_wageningen
-- id = 128805
-- parent_id = 128805
+- id = 129493
+- parent_id = 129493
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0289_wageningen/graph_values.yml b/datasets/GM0289_wageningen/graph_values.yml
index 9abb9dd1e5..aa11501d40 100644
--- a/datasets/GM0289_wageningen/graph_values.yml
+++ b/datasets/GM0289_wageningen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4715.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1556021021905919
-    :network_gas: 0.14418843795174455
-    :ambient_heat: 0.7002094598576636
+    :electricity: 0.18836994502975082
+    :network_gas: 0.1523339977368801
+    :ambient_heat: 0.659296057233369
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18053.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 534.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21644819581880198
-    :network_gas: 0.13420721672478977
-    :ambient_heat: 0.6493445874564082
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad
index d40558e994..d8873d78a1 100644
--- a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad
+++ b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0293_westervoort
-- id = 128811
-- parent_id = 128811
+- id = 129499
+- parent_id = 129499
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0293_westervoort/graph_values.yml b/datasets/GM0293_westervoort/graph_values.yml
index dadc53f9f7..710240e301 100644
--- a/datasets/GM0293_westervoort/graph_values.yml
+++ b/datasets/GM0293_westervoort/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 620.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.16468088878776646
-    :network_gas: 0.09425511166728445
-    :ambient_heat: 0.741063999544949
+    :electricity: 0.20001989906732007
+    :network_gas: 0.09990912728307323
+    :ambient_heat: 0.7000709736496067
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6739.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 5.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22815561589145555
-    :network_gas: 0.08737753643417526
-    :ambient_heat: 0.6844668476743692
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad
index 588c5fbb4e..7b75963e53 100644
--- a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad
+++ b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0294_winterswijk
-- id = 128818
-- parent_id = 128818
+- id = 129506
+- parent_id = 129506
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0294_winterswijk/graph_values.yml b/datasets/GM0294_winterswijk/graph_values.yml
index 0760beceb4..0f5fb038e3 100644
--- a/datasets/GM0294_winterswijk/graph_values.yml
+++ b/datasets/GM0294_winterswijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4272.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1533735785797161
-    :network_gas: 0.1564453178115615
-    :ambient_heat: 0.6901811036087224
+    :electricity: 0.18552201997898876
+    :network_gas: 0.16514967935818758
+    :ambient_heat: 0.6493283006628237
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13072.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 435.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21355996457418713
-    :network_gas: 0.1457601417032491
-    :ambient_heat: 0.6406798937225637
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad
index 2fe9108d24..1d9a5e9f1e 100644
--- a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad
+++ b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0296_wijchen
-- id = 128815
-- parent_id = 128815
+- id = 129503
+- parent_id = 129503
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0296_wijchen/graph_values.yml b/datasets/GM0296_wijchen/graph_values.yml
index 282a36a7f0..fc3664bd41 100644
--- a/datasets/GM0296_wijchen/graph_values.yml
+++ b/datasets/GM0296_wijchen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2977.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15639841084314351
-    :network_gas: 0.1398087403627107
-    :ambient_heat: 0.7037928487941458
+    :electricity: 0.18938869958439045
+    :network_gas: 0.1477495954826759
+    :ambient_heat: 0.6628617049329336
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18166.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 43.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21747884663790443
-    :network_gas: 0.13008461344838007
-    :ambient_heat: 0.6524365399137155
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad
index d7380c4176..d9ce0d22c0 100644
--- a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad
+++ b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0297_zaltbommel
-- id = 128824
-- parent_id = 128824
+- id = 129512
+- parent_id = 129512
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0297_zaltbommel/graph_values.yml b/datasets/GM0297_zaltbommel/graph_values.yml
index e3438aeafc..e364638793 100644
--- a/datasets/GM0297_zaltbommel/graph_values.yml
+++ b/datasets/GM0297_zaltbommel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6215.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.156337080678121
-    :network_gas: 0.14014605627033458
-    :ambient_heat: 0.7035168630515445
+    :electricity: 0.1893102161201953
+    :network_gas: 0.14810277159220628
+    :ambient_heat: 0.6625870122875984
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11803.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 458.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21739949383496016
-    :network_gas: 0.1304020246601569
-    :ambient_heat: 0.6521984815048828
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad
index 478613acbc..ac67c5cfa3 100644
--- a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad
+++ b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0299_zevenaar
-- id = 128828
-- parent_id = 128828
+- id = 129516
+- parent_id = 129516
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0299_zevenaar/graph_values.yml b/datasets/GM0299_zevenaar/graph_values.yml
index 8b78935ee5..0ebbe67b4a 100644
--- a/datasets/GM0299_zevenaar/graph_values.yml
+++ b/datasets/GM0299_zevenaar/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3853.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15665290387909722
-    :network_gas: 0.1384090286649653
-    :ambient_heat: 0.7049380674559375
+    :electricity: 0.1897144085750715
+    :network_gas: 0.1462839028638872
+    :ambient_heat: 0.6640016885610414
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20189.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 174.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21780807940052357
-    :network_gas: 0.12876768239790337
-    :ambient_heat: 0.653424238201573
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad
index a408e33fcd..f880ba5666 100644
--- a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad
+++ b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0301_zutphen
-- id = 128833
-- parent_id = 128833
+- id = 129521
+- parent_id = 129521
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0301_zutphen/graph_values.yml b/datasets/GM0301_zutphen/graph_values.yml
index f0b8d79bf0..6331e94d10 100644
--- a/datasets/GM0301_zutphen/graph_values.yml
+++ b/datasets/GM0301_zutphen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8095.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15288178226975366
-    :network_gas: 0.15915019751635487
-    :ambient_heat: 0.6879680202138915
+    :electricity: 0.18489415267123172
+    :network_gas: 0.16797508640830924
+    :ambient_heat: 0.647130760920459
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22588.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2097.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2129218099946983
-    :network_gas: 0.1483127600212044
-    :ambient_heat: 0.6387654299840972
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad
index 9c67abe22d..1f95d669d6 100644
--- a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad
+++ b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0302_nunspeet
-- id = 128704
-- parent_id = 128704
+- id = 129392
+- parent_id = 129392
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0302_nunspeet/graph_values.yml b/datasets/GM0302_nunspeet/graph_values.yml
index a95dbdfc78..6eb23b6298 100644
--- a/datasets/GM0302_nunspeet/graph_values.yml
+++ b/datasets/GM0302_nunspeet/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3118.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15431697999801086
-    :network_gas: 0.1512566100109403
-    :ambient_heat: 0.6944264099910489
+    :electricity: 0.1867270705089751
+    :network_gas: 0.15972694397905243
+    :ambient_heat: 0.6535459855119725
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11197.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 37.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21478333960452273
-    :network_gas: 0.14086664158190676
-    :ambient_heat: 0.6443500188135706
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0303_dronten/GM0303_dronten.derived.ad b/datasets/GM0303_dronten/GM0303_dronten.derived.ad
index fb68aa3fde..ccee532af5 100644
--- a/datasets/GM0303_dronten/GM0303_dronten.derived.ad
+++ b/datasets/GM0303_dronten/GM0303_dronten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0303_dronten
-- id = 128588
-- parent_id = 128588
+- id = 129276
+- parent_id = 129276
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0303_dronten/graph_values.yml b/datasets/GM0303_dronten/graph_values.yml
index 994716b9ea..454b3513e0 100644
--- a/datasets/GM0303_dronten/graph_values.yml
+++ b/datasets/GM0303_dronten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3409.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15578143351151688
-    :network_gas: 0.14320211568665708
-    :ambient_heat: 0.701016450801826
+    :electricity: 0.18859932050306388
+    :network_gas: 0.1513018065853151
+    :ambient_heat: 0.6600988729116211
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 17696.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 0.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2166803654672303
-    :network_gas: 0.1332785381310764
-    :ambient_heat: 0.6500410964016932
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad
index 6f0993e263..6c0a152ffd 100644
--- a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad
+++ b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0307_amersfoort
-- id = 128525
-- parent_id = 128525
+- id = 129213
+- parent_id = 129213
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0307_amersfoort/graph_values.yml b/datasets/GM0307_amersfoort/graph_values.yml
index 1457bcf154..53a019cb7c 100644
--- a/datasets/GM0307_amersfoort/graph_values.yml
+++ b/datasets/GM0307_amersfoort/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 23078.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1565436443034404
-    :network_gas: 0.13900995633107782
-    :ambient_heat: 0.7044463993654818
+    :electricity: 0.18957456701500008
+    :network_gas: 0.14691319081190468
+    :ambient_heat: 0.6635122421730952
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 68785.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 4819.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21766674151043539
-    :network_gas: 0.1293330339582562
-    :ambient_heat: 0.6530002245313085
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0308_baarn/GM0308_baarn.derived.ad b/datasets/GM0308_baarn/GM0308_baarn.derived.ad
index af906224be..abdc60e75b 100644
--- a/datasets/GM0308_baarn/GM0308_baarn.derived.ad
+++ b/datasets/GM0308_baarn/GM0308_baarn.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0308_baarn
-- id = 128533
-- parent_id = 128533
+- id = 129221
+- parent_id = 129221
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0308_baarn/graph_values.yml b/datasets/GM0308_baarn/graph_values.yml
index 9005904ecb..2e0cdf1cc5 100644
--- a/datasets/GM0308_baarn/graph_values.yml
+++ b/datasets/GM0308_baarn/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3162.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14994603360192246
-    :network_gas: 0.1752968151894263
-    :ambient_heat: 0.6747571512086512
+    :electricity: 0.18115079077214039
+    :network_gas: 0.18482023978734602
+    :ambient_heat: 0.6340289694405137
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11684.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 547.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20910656101465178
-    :network_gas: 0.1635737559413907
-    :ambient_heat: 0.6273196830439576
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad
index a5eb870e5e..822b49de8b 100644
--- a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad
+++ b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0310_de_bilt
-- id = 128571
-- parent_id = 128571
+- id = 129259
+- parent_id = 129259
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0310_de_bilt/graph_values.yml b/datasets/GM0310_de_bilt/graph_values.yml
index 292542b38f..c11a9c2a0a 100644
--- a/datasets/GM0310_de_bilt/graph_values.yml
+++ b/datasets/GM0310_de_bilt/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5194.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15103027349245107
-    :network_gas: 0.16933349579151913
-    :ambient_heat: 0.6796362307160297
+    :electricity: 0.1825323731217937
+    :network_gas: 0.17860311004861312
+    :ambient_heat: 0.6388645168295931
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19696.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 927.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2105167837075729
-    :network_gas: 0.15793286516970625
-    :ambient_heat: 0.6315503511227208
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad
index b6d04068e8..60f2d88f17 100644
--- a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad
+++ b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0312_bunnik
-- id = 128561
-- parent_id = 128561
+- id = 129249
+- parent_id = 129249
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0312_bunnik/graph_values.yml b/datasets/GM0312_bunnik/graph_values.yml
index 2651463a04..24789c3ddf 100644
--- a/datasets/GM0312_bunnik/graph_values.yml
+++ b/datasets/GM0312_bunnik/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1591.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15064970833298452
-    :network_gas: 0.17142660416858507
-    :ambient_heat: 0.6779236874984305
+    :electricity: 0.18204731792831497
+    :network_gas: 0.18078586163707996
+    :ambient_heat: 0.6371668204346052
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6470.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 69.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21002195479463084
-    :network_gas: 0.1599121808214744
-    :ambient_heat: 0.6300658643838948
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad
index 4ad3754146..5368a6fecc 100644
--- a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad
+++ b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0313_bunschoten
-- id = 128562
-- parent_id = 128562
+- id = 129250
+- parent_id = 129250
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0313_bunschoten/graph_values.yml b/datasets/GM0313_bunschoten/graph_values.yml
index 85a039a4fb..36da6f706a 100644
--- a/datasets/GM0313_bunschoten/graph_values.yml
+++ b/datasets/GM0313_bunschoten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1532.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15696441481783321
-    :network_gas: 0.13669571850191742
-    :ambient_heat: 0.7063398666802494
+    :electricity: 0.1901131730165859
+    :network_gas: 0.1444894602317049
+    :ambient_heat: 0.6653973667517092
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8541.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 218.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21821097371785944
-    :network_gas: 0.12715610512856002
-    :ambient_heat: 0.6546329211535806
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad
index 9f9d5981a9..2ebde83a24 100644
--- a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad
+++ b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0317_eemnes
-- id = 128594
-- parent_id = 128594
+- id = 129282
+- parent_id = 129282
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0317_eemnes/graph_values.yml b/datasets/GM0317_eemnes/graph_values.yml
index e9f3ac9155..b60fffa3e3 100644
--- a/datasets/GM0317_eemnes/graph_values.yml
+++ b/datasets/GM0317_eemnes/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 558.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1526952793046283
-    :network_gas: 0.16017596382454438
-    :ambient_heat: 0.6871287568708274
+    :electricity: 0.18465610633856058
+    :network_gas: 0.16904629648450728
+    :ambient_heat: 0.646297597176932
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4079.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 5.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2126797307436889
-    :network_gas: 0.14928107702524224
-    :ambient_heat: 0.638039192231069
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0321_houten/GM0321_houten.derived.ad b/datasets/GM0321_houten/GM0321_houten.derived.ad
index 9e154e661e..8abb3f49f2 100644
--- a/datasets/GM0321_houten/GM0321_houten.derived.ad
+++ b/datasets/GM0321_houten/GM0321_houten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0321_houten
-- id = 128648
-- parent_id = 128648
+- id = 129336
+- parent_id = 129336
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0321_houten/graph_values.yml b/datasets/GM0321_houten/graph_values.yml
index 5df69cee4a..983704e1ec 100644
--- a/datasets/GM0321_houten/graph_values.yml
+++ b/datasets/GM0321_houten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5052.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.16159718848600838
-    :network_gas: 0.11121546332695392
-    :ambient_heat: 0.7271873481870378
+    :electricity: 0.19605424465149396
+    :network_gas: 0.11775459846208469
+    :ambient_heat: 0.6861911568864213
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20672.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 46.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2241896515214512
-    :network_gas: 0.10324139391419268
-    :ambient_heat: 0.6725689545643561
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0327_leusden/GM0327_leusden.derived.ad b/datasets/GM0327_leusden/GM0327_leusden.derived.ad
index 71c7155296..9da981dbb7 100644
--- a/datasets/GM0327_leusden/GM0327_leusden.derived.ad
+++ b/datasets/GM0327_leusden/GM0327_leusden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0327_leusden
-- id = 128671
-- parent_id = 128671
+- id = 129359
+- parent_id = 129359
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0327_leusden/graph_values.yml b/datasets/GM0327_leusden/graph_values.yml
index a9743d4498..7bc0908e7d 100644
--- a/datasets/GM0327_leusden/graph_values.yml
+++ b/datasets/GM0327_leusden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3709.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15671207174584403
-    :network_gas: 0.13808360539785786
-    :ambient_heat: 0.7052043228562981
+    :electricity: 0.18979014228444266
+    :network_gas: 0.14594310066930627
+    :ambient_heat: 0.664266757046251
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13220.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 12.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21788461305992265
-    :network_gas: 0.12846154776030708
-    :ambient_heat: 0.6536538391797703
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0331_lopik/GM0331_lopik.derived.ad b/datasets/GM0331_lopik/GM0331_lopik.derived.ad
index b22a616fc2..6073319300 100644
--- a/datasets/GM0331_lopik/GM0331_lopik.derived.ad
+++ b/datasets/GM0331_lopik/GM0331_lopik.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0331_lopik
-- id = 128676
-- parent_id = 128676
+- id = 129364
+- parent_id = 129364
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0331_lopik/graph_values.yml b/datasets/GM0331_lopik/graph_values.yml
index bcf3b6fea7..af9b08ce16 100644
--- a/datasets/GM0331_lopik/graph_values.yml
+++ b/datasets/GM0331_lopik/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 684.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15598087115297696
-    :network_gas: 0.14210520865862664
-    :ambient_heat: 0.7019139201883964
+    :electricity: 0.1888544482453988
+    :network_gas: 0.15015373005231356
+    :ambient_heat: 0.6609918217022877
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5822.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 73.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21693852207835213
-    :network_gas: 0.13224591168658906
-    :ambient_heat: 0.6508155662350588
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad
index b9ede2dc34..dcda81d2e1 100644
--- a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad
+++ b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0335_montfoort
-- id = 128690
-- parent_id = 128690
+- id = 129378
+- parent_id = 129378
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0335_montfoort/graph_values.yml b/datasets/GM0335_montfoort/graph_values.yml
index 20d41caaa0..755b7344f4 100644
--- a/datasets/GM0335_montfoort/graph_values.yml
+++ b/datasets/GM0335_montfoort/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1010.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15575249146107667
-    :network_gas: 0.1433612969640782
-    :ambient_heat: 0.7008862115748451
+    :electricity: 0.1885622998701334
+    :network_gas: 0.15146839967909392
+    :ambient_heat: 0.6599693004507727
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5746.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 171.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21664289841401765
-    :network_gas: 0.13342840634392716
-    :ambient_heat: 0.6499286952420552
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad
index b6cce15d39..5cc91d1e63 100644
--- a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad
+++ b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0339_renswoude
-- id = 128733
-- parent_id = 128733
+- id = 129421
+- parent_id = 129421
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0339_renswoude/graph_values.yml b/datasets/GM0339_renswoude/graph_values.yml
index 514f00cb0f..dbfeb2d09d 100644
--- a/datasets/GM0339_renswoude/graph_values.yml
+++ b/datasets/GM0339_renswoude/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 320.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15583346476549562
-    :network_gas: 0.14291594378977412
-    :ambient_heat: 0.7012505914447302
+    :electricity: 0.1886658771760401
+    :network_gas: 0.15100230111539112
+    :ambient_heat: 0.6603318217085689
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 2149.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 8.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2167477203199046
-    :network_gas: 0.1330091187203793
-    :ambient_heat: 0.6502431609597161
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad
index 84169abd97..7adf4449b6 100644
--- a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad
+++ b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0340_rhenen
-- id = 128736
-- parent_id = 128736
+- id = 129424
+- parent_id = 129424
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0340_rhenen/graph_values.yml b/datasets/GM0340_rhenen/graph_values.yml
index 8c07fdd8e0..05fa37a742 100644
--- a/datasets/GM0340_rhenen/graph_values.yml
+++ b/datasets/GM0340_rhenen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1258.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1548682829006255
-    :network_gas: 0.14822444404655982
-    :ambient_heat: 0.6969072730528146
+    :electricity: 0.18743165740397333
+    :network_gas: 0.1565562982773943
+    :ambient_heat: 0.6560120443186324
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8269.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 219.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.215497777346295
-    :network_gas: 0.13800889061481772
-    :ambient_heat: 0.6464933320388873
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0342_soest/GM0342_soest.derived.ad b/datasets/GM0342_soest/GM0342_soest.derived.ad
index 0fe0a8b3f3..9af315c6b8 100644
--- a/datasets/GM0342_soest/GM0342_soest.derived.ad
+++ b/datasets/GM0342_soest/GM0342_soest.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0342_soest
-- id = 128758
-- parent_id = 128758
+- id = 129446
+- parent_id = 129446
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0342_soest/graph_values.yml b/datasets/GM0342_soest/graph_values.yml
index 6e7877606d..0cf3a2c88b 100644
--- a/datasets/GM0342_soest/graph_values.yml
+++ b/datasets/GM0342_soest/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4067.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15363475166379434
-    :network_gas: 0.15500886584913107
-    :ambient_heat: 0.6913563824870745
+    :electricity: 0.18585554594038076
+    :network_gas: 0.16364881031934247
+    :ambient_heat: 0.6504956437402768
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20935.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 301.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21389874897970623
-    :network_gas: 0.14440500408117274
-    :ambient_heat: 0.641696246939121
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad
index 3ade0226bc..de27647a4a 100644
--- a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad
+++ b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0344_utrecht
-- id = 128783
-- parent_id = 128783
+- id = 129471
+- parent_id = 129471
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0344_utrecht/graph_values.yml b/datasets/GM0344_utrecht/graph_values.yml
index ada007d092..5932aa10b1 100644
--- a/datasets/GM0344_utrecht/graph_values.yml
+++ b/datasets/GM0344_utrecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 37480.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.16079777161602193
-    :network_gas: 0.11561225611187935
-    :ambient_heat: 0.7235899722720986
+    :electricity: 0.1950276425368375
+    :network_gas: 0.12237431478842468
+    :ambient_heat: 0.6825980426747378
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 159409.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 22086.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2231597449636124
-    :network_gas: 0.10736102014554783
-    :ambient_heat: 0.6694792348908396
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad
index a7a0fd5357..4102a5e5ad 100644
--- a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad
+++ b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0345_veenendaal
-- id = 128789
-- parent_id = 128789
+- id = 129477
+- parent_id = 129477
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0345_veenendaal/graph_values.yml b/datasets/GM0345_veenendaal/graph_values.yml
index 88a702de9a..aaefa0e65a 100644
--- a/datasets/GM0345_veenendaal/graph_values.yml
+++ b/datasets/GM0345_veenendaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 7140.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1580979708362248
-    :network_gas: 0.13046116040076383
-    :ambient_heat: 0.7114408687630115
+    :electricity: 0.1915649974665845
+    :network_gas: 0.13795624057543865
+    :ambient_heat: 0.670478761957977
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 28601.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 522.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21967612291323727
-    :network_gas: 0.12129550834704861
-    :ambient_heat: 0.6590283687397142
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad
index 558036f9e7..1724f5bcf8 100644
--- a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad
+++ b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0351_woudenberg
-- id = 128822
-- parent_id = 128822
+- id = 129510
+- parent_id = 129510
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0351_woudenberg/graph_values.yml b/datasets/GM0351_woudenberg/graph_values.yml
index ae5b2e357a..0ddd8c5b8a 100644
--- a/datasets/GM0351_woudenberg/graph_values.yml
+++ b/datasets/GM0351_woudenberg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 789.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15738933612573136
-    :network_gas: 0.13435865130847763
-    :ambient_heat: 0.7082520125657911
+    :electricity: 0.19065725933901254
+    :network_gas: 0.14204106817136528
+    :ambient_heat: 0.6673016724896221
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5279.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 27.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2187603680264041
-    :network_gas: 0.12495852789438122
-    :ambient_heat: 0.6562811040792147
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad
index d7c3b5a098..2b5cf7f608 100644
--- a/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad
+++ b/datasets/GM0352_wijk_bij_duurstede/GM0352_wijk_bij_duurstede.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0352_wijk_bij_duurstede
-- id = 128817
-- parent_id = 128817
+- id = 129505
+- parent_id = 129505
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml
index 091b6c8ff3..fba5d4c97a 100644
--- a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml
+++ b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1091.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15414146629800987
-    :network_gas: 0.15222193536094566
-    :ambient_heat: 0.6936365983410445
+    :electricity: 0.18650281622428044
+    :network_gas: 0.16073608974786105
+    :ambient_heat: 0.6527610940278585
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10238.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 232.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21455581643655944
-    :network_gas: 0.14177673425376
-    :ambient_heat: 0.6436674493096806
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad
index c814031297..95142b32a8 100644
--- a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad
+++ b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0353_ijsselstein
-- id = 128651
-- parent_id = 128651
+- id = 129339
+- parent_id = 129339
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0353_ijsselstein/graph_values.yml b/datasets/GM0353_ijsselstein/graph_values.yml
index 1e9ba842a6..baef60d84a 100644
--- a/datasets/GM0353_ijsselstein/graph_values.yml
+++ b/datasets/GM0353_ijsselstein/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2120.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15708603951047947
-    :network_gas: 0.13602678269236274
-    :ambient_heat: 0.7068871777971577
+    :electricity: 0.19026888900413239
+    :network_gas: 0.1437887372547398
+    :ambient_heat: 0.6659423737411277
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14438.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 168.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2183682473651754
-    :network_gas: 0.12652701053929616
-    :ambient_heat: 0.6551047420955285
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0355_zeist/GM0355_zeist.derived.ad b/datasets/GM0355_zeist/GM0355_zeist.derived.ad
index 6cca6aa07d..829d26942b 100644
--- a/datasets/GM0355_zeist/GM0355_zeist.derived.ad
+++ b/datasets/GM0355_zeist/GM0355_zeist.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0355_zeist
-- id = 128827
-- parent_id = 128827
+- id = 129515
+- parent_id = 129515
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0355_zeist/graph_values.yml b/datasets/GM0355_zeist/graph_values.yml
index 93a82f76a1..fe879bca41 100644
--- a/datasets/GM0355_zeist/graph_values.yml
+++ b/datasets/GM0355_zeist/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8964.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15204731013219344
-    :network_gas: 0.16373979427293617
-    :ambient_heat: 0.6842128955948704
+    :electricity: 0.18382930975350603
+    :network_gas: 0.17276688660214687
+    :ambient_heat: 0.6434038036443471
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 29560.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1509.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2118383595834605
-    :network_gas: 0.15264656166615578
-    :ambient_heat: 0.6355150787503838
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad
index aa4d71775e..36dc906262 100644
--- a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad
+++ b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0356_nieuwegein
-- id = 128694
-- parent_id = 128694
+- id = 129382
+- parent_id = 129382
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0356_nieuwegein/graph_values.yml b/datasets/GM0356_nieuwegein/graph_values.yml
index 7f6724153f..aa90a32264 100644
--- a/datasets/GM0356_nieuwegein/graph_values.yml
+++ b/datasets/GM0356_nieuwegein/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 12644.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.16783677965227972
-    :network_gas: 0.07689771191246152
-    :ambient_heat: 0.7552655084352587
+    :electricity: 0.20408762575441264
+    :network_gas: 0.08160433020622415
+    :ambient_heat: 0.714308044039363
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 29444.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 245.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2322032193514984
-    :network_gas: 0.0711871225940041
-    :ambient_heat: 0.6966096580544976
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad
index a2c56a6744..0549fe544c 100644
--- a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad
+++ b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0358_aalsmeer
-- id = 128514
-- parent_id = 128514
+- id = 129202
+- parent_id = 129202
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0358_aalsmeer/graph_values.yml b/datasets/GM0358_aalsmeer/graph_values.yml
index 4db554f8b8..04d5790456 100644
--- a/datasets/GM0358_aalsmeer/graph_values.yml
+++ b/datasets/GM0358_aalsmeer/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2787.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1546784016713237
-    :network_gas: 0.14926879080771965
-    :ambient_heat: 0.6960528075209568
+    :electricity: 0.18718894985708004
+    :network_gas: 0.15764848384851415
+    :ambient_heat: 0.6551625662944057
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13276.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 204.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.215251748357674
-    :network_gas: 0.13899300656930177
-    :ambient_heat: 0.6457552450730243
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad
index 95f5d13822..3660de89fd 100644
--- a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad
+++ b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0361_alkmaar
-- id = 128519
-- parent_id = 128519
+- id = 129207
+- parent_id = 129207
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0361_alkmaar/graph_values.yml b/datasets/GM0361_alkmaar/graph_values.yml
index e987171a23..33283fa5cd 100644
--- a/datasets/GM0361_alkmaar/graph_values.yml
+++ b/datasets/GM0361_alkmaar/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 14134.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1537214820042454
-    :network_gas: 0.1545318489766503
-    :ambient_heat: 0.6917466690191043
+    :electricity: 0.18596631719961296
+    :network_gas: 0.1631503389179511
+    :ambient_heat: 0.6508833438824361
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 51588.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 4510.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21401123505550101
-    :network_gas: 0.14395505977799364
-    :ambient_heat: 0.6420337051665054
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad
index 95e912af62..6bcbdc3abb 100644
--- a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad
+++ b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0362_amstelveen
-- id = 128526
-- parent_id = 128526
+- id = 129214
+- parent_id = 129214
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0362_amstelveen/graph_values.yml b/datasets/GM0362_amstelveen/graph_values.yml
index 1837c15ae8..fb2ae289db 100644
--- a/datasets/GM0362_amstelveen/graph_values.yml
+++ b/datasets/GM0362_amstelveen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 11718.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15405360097319226
-    :network_gas: 0.15270519464744262
-    :ambient_heat: 0.6932412043793652
+    :electricity: 0.18639056121239672
+    :network_gas: 0.16124123804602733
+    :ambient_heat: 0.6523682007415759
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 42242.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1997.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21444190087853188
-    :network_gas: 0.14223239648587024
-    :ambient_heat: 0.6433257026355979
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad
index 3a8424b5bc..6c32bb5a5e 100644
--- a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad
+++ b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0363_amsterdam
-- id = 128527
-- parent_id = 128527
+- id = 129215
+- parent_id = 129215
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0363_amsterdam/graph_values.yml b/datasets/GM0363_amsterdam/graph_values.yml
index 251e0f7b8b..3c1393ea10 100644
--- a/datasets/GM0363_amsterdam/graph_values.yml
+++ b/datasets/GM0363_amsterdam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 163872.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1536034907586839
-    :network_gas: 0.15518080082723856
-    :ambient_heat: 0.6912157084140775
+    :electricity: 0.18581562148516684
+    :network_gas: 0.1638284706326602
+    :ambient_heat: 0.650355907882173
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 457831.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 10186.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21385820260033056
-    :network_gas: 0.14456718959867546
-    :ambient_heat: 0.641574607800994
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0373_bergen/GM0373_bergen.derived.ad b/datasets/GM0373_bergen/GM0373_bergen.derived.ad
index a479c25701..fb624c8c18 100644
--- a/datasets/GM0373_bergen/GM0373_bergen.derived.ad
+++ b/datasets/GM0373_bergen/GM0373_bergen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0373_bergen
-- id = 128541
-- parent_id = 128541
+- id = 129229
+- parent_id = 129229
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0373_bergen/graph_values.yml b/datasets/GM0373_bergen/graph_values.yml
index a8828877ca..910a931f0f 100644
--- a/datasets/GM0373_bergen/graph_values.yml
+++ b/datasets/GM0373_bergen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8034.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1498788863186848
-    :network_gas: 0.17566612524723377
-    :ambient_heat: 0.6744549884340815
+    :electricity: 0.1810652646785893
+    :network_gas: 0.1852051077756982
+    :ambient_heat: 0.6337296275457125
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15239.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 273.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20901918067476688
-    :network_gas: 0.16392327730093026
-    :ambient_heat: 0.6270575420243029
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad
index 4cb059f0a5..372d797c48 100644
--- a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad
+++ b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0375_beverwijk
-- id = 128547
-- parent_id = 128547
+- id = 129235
+- parent_id = 129235
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0375_beverwijk/graph_values.yml b/datasets/GM0375_beverwijk/graph_values.yml
index d2b438c9cb..1410fdaf17 100644
--- a/datasets/GM0375_beverwijk/graph_values.yml
+++ b/datasets/GM0375_beverwijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4888.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15297306864016064
-    :network_gas: 0.15864812247911655
-    :ambient_heat: 0.6883788088807229
+    :electricity: 0.1850106793719058
+    :network_gas: 0.16745071548224832
+    :ambient_heat: 0.6475386051458458
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19501.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1514.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21304028426127752
-    :network_gas: 0.1478388629548877
-    :ambient_heat: 0.6391208527838348
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad
index ec763e4c7b..e964bfc62a 100644
--- a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad
+++ b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0376_blaricum
-- id = 128549
-- parent_id = 128549
+- id = 129237
+- parent_id = 129237
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0376_blaricum/graph_values.yml b/datasets/GM0376_blaricum/graph_values.yml
index b3f2403281..39bf8aad61 100644
--- a/datasets/GM0376_blaricum/graph_values.yml
+++ b/datasets/GM0376_blaricum/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 721.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15600177420992856
-    :network_gas: 0.14199024184539275
-    :ambient_heat: 0.7020079839446786
+    :electricity: 0.18888119032060055
+    :network_gas: 0.15003339053650122
+    :ambient_heat: 0.6610854191428983
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5136.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 21.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21696557681804882
-    :network_gas: 0.1321376927278023
-    :ambient_heat: 0.6508967304541488
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad
index fcfe2f5fef..e60ee2a511 100644
--- a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad
+++ b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0377_bloemendaal
-- id = 128550
-- parent_id = 128550
+- id = 129238
+- parent_id = 129238
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0377_bloemendaal/graph_values.yml b/datasets/GM0377_bloemendaal/graph_values.yml
index e67c51bb03..33b0d8e4ff 100644
--- a/datasets/GM0377_bloemendaal/graph_values.yml
+++ b/datasets/GM0377_bloemendaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1509.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14749567854031542
-    :network_gas: 0.1887737680282651
-    :ambient_heat: 0.6637305534314194
+    :electricity: 0.17803244420101969
+    :network_gas: 0.1988528200442192
+    :ambient_heat: 0.6231147357547612
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10145.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1312.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20591446331405433
-    :network_gas: 0.1763421467437805
-    :ambient_heat: 0.6177433899421652
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0383_castricum/GM0383_castricum.derived.ad b/datasets/GM0383_castricum/GM0383_castricum.derived.ad
index 38e540a3e6..b29303e784 100644
--- a/datasets/GM0383_castricum/GM0383_castricum.derived.ad
+++ b/datasets/GM0383_castricum/GM0383_castricum.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0383_castricum
-- id = 128565
-- parent_id = 128565
+- id = 129253
+- parent_id = 129253
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0383_castricum/graph_values.yml b/datasets/GM0383_castricum/graph_values.yml
index af181da0d0..e831ad813b 100644
--- a/datasets/GM0383_castricum/graph_values.yml
+++ b/datasets/GM0383_castricum/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2495.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1528763317382504
-    :network_gas: 0.1591801754396227
-    :ambient_heat: 0.6879434928221269
+    :electricity: 0.18488719533285022
+    :network_gas: 0.1680063944771804
+    :ambient_heat: 0.6471064101899693
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16223.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 363.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21291473582203216
-    :network_gas: 0.14834105671186915
-    :ambient_heat: 0.6387442074660987
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0384_diemen/GM0384_diemen.derived.ad b/datasets/GM0384_diemen/GM0384_diemen.derived.ad
index 81b4be6e16..ad71df910e 100644
--- a/datasets/GM0384_diemen/GM0384_diemen.derived.ad
+++ b/datasets/GM0384_diemen/GM0384_diemen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0384_diemen
-- id = 128580
-- parent_id = 128580
+- id = 129268
+- parent_id = 129268
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0384_diemen/graph_values.yml b/datasets/GM0384_diemen/graph_values.yml
index e720675f8b..c07265ebd6 100644
--- a/datasets/GM0384_diemen/graph_values.yml
+++ b/datasets/GM0384_diemen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3072.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15938830478089142
-    :network_gas: 0.12336432370509723
-    :ambient_heat: 0.7172473715140114
+    :electricity: 0.1932190746944467
+    :network_gas: 0.13051288207705924
+    :ambient_heat: 0.6762680432284939
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15467.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 185.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22134211605853285
-    :network_gas: 0.11463153576586624
-    :ambient_heat: 0.6640263481756009
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad
index bf8456b5f9..0864c8015a 100644
--- a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad
+++ b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0385_edam_volendam
-- id = 128592
-- parent_id = 128592
+- id = 129280
+- parent_id = 129280
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0385_edam_volendam/graph_values.yml b/datasets/GM0385_edam_volendam/graph_values.yml
index b5b2c06b73..814c57629b 100644
--- a/datasets/GM0385_edam_volendam/graph_values.yml
+++ b/datasets/GM0385_edam_volendam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2558.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1532450888885955
-    :network_gas: 0.15715201111272478
-    :ambient_heat: 0.6896028999986799
+    :electricity: 0.18535795793387702
+    :network_gas: 0.16588795964956307
+    :ambient_heat: 0.6487540824165599
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15416.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 652.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2133932634084681
-    :network_gas: 0.1464269463661255
-    :ambient_heat: 0.6401797902254066
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad
index 8a84d231f7..6386d67a11 100644
--- a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad
+++ b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0388_enkhuizen
-- id = 128600
-- parent_id = 128600
+- id = 129288
+- parent_id = 129288
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0388_enkhuizen/graph_values.yml b/datasets/GM0388_enkhuizen/graph_values.yml
index d256078814..63bb120d29 100644
--- a/datasets/GM0388_enkhuizen/graph_values.yml
+++ b/datasets/GM0388_enkhuizen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1381.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15230893794172068
-    :network_gas: 0.16230084132053632
-    :ambient_heat: 0.685390220737743
+    :electricity: 0.1841630951926599
+    :network_gas: 0.17126484991165195
+    :ambient_heat: 0.6445720548956881
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8878.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 904.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21217813498076935
-    :network_gas: 0.1512874600769204
-    :ambient_heat: 0.6365344049423103
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad
index 18aea80b73..6ad608a931 100644
--- a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad
+++ b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0392_haarlem
-- id = 128619
-- parent_id = 128619
+- id = 129307
+- parent_id = 129307
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0392_haarlem/graph_values.yml b/datasets/GM0392_haarlem/graph_values.yml
index ef2c21000d..01c3dd0f87 100644
--- a/datasets/GM0392_haarlem/graph_values.yml
+++ b/datasets/GM0392_haarlem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 15954.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14967672104722257
-    :network_gas: 0.17677803424027577
-    :ambient_heat: 0.6735452447125017
+    :electricity: 0.1808077900924109
+    :network_gas: 0.18636374512156414
+    :ambient_heat: 0.632828464786025
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 77093.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 21955.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2087560666460567
-    :network_gas: 0.16497573341577101
-    :ambient_heat: 0.6262681999381723
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad
index 62e21eb034..4b59a98e5c 100644
--- a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad
+++ b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0394_haarlemmermeer
-- id = 128620
-- parent_id = 128620
+- id = 129308
+- parent_id = 129308
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0394_haarlemmermeer/graph_values.yml b/datasets/GM0394_haarlemmermeer/graph_values.yml
index febc6452c7..d420bb64d2 100644
--- a/datasets/GM0394_haarlemmermeer/graph_values.yml
+++ b/datasets/GM0394_haarlemmermeer/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 30566.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15603201314128287
-    :network_gas: 0.14182392772294422
-    :ambient_heat: 0.7021440591357729
+    :electricity: 0.18891987685315542
+    :network_gas: 0.14985930088336125
+    :ambient_heat: 0.6612208222634833
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 65149.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 794.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21700471405087426
-    :network_gas: 0.1319811437965007
-    :ambient_heat: 0.6510141421526251
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad
index 10357cd37b..1edd9d7458 100644
--- a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad
+++ b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0396_heemskerk
-- id = 128627
-- parent_id = 128627
+- id = 129315
+- parent_id = 129315
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0396_heemskerk/graph_values.yml b/datasets/GM0396_heemskerk/graph_values.yml
index cf3dde2b06..5ac743e6f3 100644
--- a/datasets/GM0396_heemskerk/graph_values.yml
+++ b/datasets/GM0396_heemskerk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3510.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15421713074842894
-    :network_gas: 0.151805780883641
-    :ambient_heat: 0.6939770883679302
+    :electricity: 0.1865994893751799
+    :network_gas: 0.16030105992749263
+    :ambient_heat: 0.6530994506973276
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 17591.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 89.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2146539066748073
-    :network_gas: 0.14138437330076845
-    :ambient_heat: 0.6439617200244242
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad
index 539a2dfc26..699afeaac5 100644
--- a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad
+++ b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0397_heemstede
-- id = 128628
-- parent_id = 128628
+- id = 129316
+- parent_id = 129316
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0397_heemstede/graph_values.yml b/datasets/GM0397_heemstede/graph_values.yml
index f338e376ae..67d05e3f74 100644
--- a/datasets/GM0397_heemstede/graph_values.yml
+++ b/datasets/GM0397_heemstede/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2575.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14845058502712585
-    :network_gas: 0.18352178235080777
-    :ambient_heat: 0.6680276326220664
+    :electricity: 0.17924700975263844
+    :network_gas: 0.19338726700461634
+    :ambient_heat: 0.6273657232427452
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12813.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2159.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20715925808681038
-    :network_gas: 0.1713629676527563
-    :ambient_heat: 0.6214777742604334
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad
index 8e44714e27..92fe4a822b 100644
--- a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad
+++ b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0399_heiloo
-- id = 128633
-- parent_id = 128633
+- id = 129321
+- parent_id = 129321
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0399_heiloo/graph_values.yml b/datasets/GM0399_heiloo/graph_values.yml
index 84e0067e8c..67250b0dcf 100644
--- a/datasets/GM0399_heiloo/graph_values.yml
+++ b/datasets/GM0399_heiloo/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1702.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1527218616949107
-    :network_gas: 0.16002976067799127
-    :ambient_heat: 0.6872483776270981
+    :electricity: 0.18469003327105454
+    :network_gas: 0.16889362506321634
+    :ambient_heat: 0.646416341665729
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10934.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 96.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21271423691645433
-    :network_gas: 0.14914305233418043
-    :ambient_heat: 0.6381427107493652
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad
index eac36dbc61..4f46f01ba2 100644
--- a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad
+++ b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0400_den_helder
-- id = 128577
-- parent_id = 128577
+- id = 129265
+- parent_id = 129265
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0400_den_helder/graph_values.yml b/datasets/GM0400_den_helder/graph_values.yml
index a0931f44d8..baafbd1216 100644
--- a/datasets/GM0400_den_helder/graph_values.yml
+++ b/datasets/GM0400_den_helder/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8805.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14937417038567777
-    :network_gas: 0.1784420628787723
-    :ambient_heat: 0.67218376673555
+    :electricity: 0.18042253666224353
+    :network_gas: 0.18809738811305388
+    :ambient_heat: 0.6314800752247025
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 28369.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 3822.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20836221439465308
-    :network_gas: 0.1665511424213856
-    :ambient_heat: 0.6250866431839615
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad
index 8840363f4e..f83b2d596d 100644
--- a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad
+++ b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0402_hilversum
-- id = 128642
-- parent_id = 128642
+- id = 129330
+- parent_id = 129330
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0402_hilversum/graph_values.yml b/datasets/GM0402_hilversum/graph_values.yml
index d16d062cde..6ef8aa2fc9 100644
--- a/datasets/GM0402_hilversum/graph_values.yml
+++ b/datasets/GM0402_hilversum/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 15277.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14938379755423886
-    :network_gas: 0.1783891134516862
-    :ambient_heat: 0.6722270889940749
+    :electricity: 0.18043479413392283
+    :network_gas: 0.18804222940918194
+    :ambient_heat: 0.6315229764568951
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 42918.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 8091.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2083747484194476
-    :network_gas: 0.16650100632220746
-    :ambient_heat: 0.625124245258345
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad
index c6d2084ddf..d6ef9fb124 100644
--- a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad
+++ b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0405_hoorn
-- id = 128646
-- parent_id = 128646
+- id = 129334
+- parent_id = 129334
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0405_hoorn/graph_values.yml b/datasets/GM0405_hoorn/graph_values.yml
index 117fb2d5b2..1c7ba8727a 100644
--- a/datasets/GM0405_hoorn/graph_values.yml
+++ b/datasets/GM0405_hoorn/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 7788.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15460177727487417
-    :network_gas: 0.149690224988192
-    :ambient_heat: 0.6957079977369338
+    :electricity: 0.18709101747798548
+    :network_gas: 0.1580891802041143
+    :ambient_heat: 0.6548198023179004
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 33643.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1483.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21515245439939565
-    :network_gas: 0.1393901824024152
-    :ambient_heat: 0.6454573631981891
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0406_huizen/GM0406_huizen.derived.ad b/datasets/GM0406_huizen/GM0406_huizen.derived.ad
index ad3a8165d8..139af52cb3 100644
--- a/datasets/GM0406_huizen/GM0406_huizen.derived.ad
+++ b/datasets/GM0406_huizen/GM0406_huizen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0406_huizen
-- id = 128649
-- parent_id = 128649
+- id = 129337
+- parent_id = 129337
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0406_huizen/graph_values.yml b/datasets/GM0406_huizen/graph_values.yml
index 622f2f31db..8b8f956dee 100644
--- a/datasets/GM0406_huizen/graph_values.yml
+++ b/datasets/GM0406_huizen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3184.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1524768430243796
-    :network_gas: 0.16137736336591227
-    :ambient_heat: 0.6861457936097082
+    :electricity: 0.18437734230106761
+    :network_gas: 0.17030073650252125
+    :ambient_heat: 0.6453219211964111
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19010.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 422.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2123961511752331
-    :network_gas: 0.1504153952990653
-    :ambient_heat: 0.6371884535257016
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad
index 5026978fb6..7dd39a0252 100644
--- a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad
+++ b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0415_landsmeer
-- id = 128662
-- parent_id = 128662
+- id = 129350
+- parent_id = 129350
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0415_landsmeer/graph_values.yml b/datasets/GM0415_landsmeer/graph_values.yml
index 96300b0bee..d298ab4fbb 100644
--- a/datasets/GM0415_landsmeer/graph_values.yml
+++ b/datasets/GM0415_landsmeer/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 508.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15497101096020208
-    :network_gas: 0.14765943971888862
-    :ambient_heat: 0.6973695493209093
+    :electricity: 0.18756297909142297
+    :network_gas: 0.15596534981269478
+    :ambient_heat: 0.6564716710958822
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4888.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 7.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21563086469636628
-    :network_gas: 0.13747654121453265
-    :ambient_heat: 0.6468925940891012
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0417_laren/GM0417_laren.derived.ad b/datasets/GM0417_laren/GM0417_laren.derived.ad
index dfb4b32d42..d64138d8bd 100644
--- a/datasets/GM0417_laren/GM0417_laren.derived.ad
+++ b/datasets/GM0417_laren/GM0417_laren.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0417_laren
-- id = 128664
-- parent_id = 128664
+- id = 129352
+- parent_id = 129352
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0417_laren/graph_values.yml b/datasets/GM0417_laren/graph_values.yml
index 342baf53ff..7abf522b82 100644
--- a/datasets/GM0417_laren/graph_values.yml
+++ b/datasets/GM0417_laren/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1436.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14694837215088066
-    :network_gas: 0.19178395317015642
-    :ambient_heat: 0.661267674678963
+    :electricity: 0.17733669221932696
+    :network_gas: 0.2019837085773924
+    :ambient_heat: 0.6206795992032806
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5427.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 257.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20520052828317567
-    :network_gas: 0.1791978868672951
-    :ambient_heat: 0.6156015848495292
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad
index adc4c5f992..ecab87ec3c 100644
--- a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad
+++ b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0420_medemblik
-- id = 128682
-- parent_id = 128682
+- id = 129370
+- parent_id = 129370
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0420_medemblik/graph_values.yml b/datasets/GM0420_medemblik/graph_values.yml
index c1c5545f44..abef42d8eb 100644
--- a/datasets/GM0420_medemblik/graph_values.yml
+++ b/datasets/GM0420_medemblik/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3263.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15401674152263733
-    :network_gas: 0.15290792162549466
-    :ambient_heat: 0.6930753368518681
+    :electricity: 0.18634347243404115
+    :network_gas: 0.16145313786101026
+    :ambient_heat: 0.6522033897049486
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19174.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 305.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21439411071746747
-    :network_gas: 0.1424235571301279
-    :ambient_heat: 0.6431823321524047
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad
index 98fa31ec27..366bbd0965 100644
--- a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad
+++ b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0431_oostzaan
-- id = 128716
-- parent_id = 128716
+- id = 129404
+- parent_id = 129404
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0431_oostzaan/graph_values.yml b/datasets/GM0431_oostzaan/graph_values.yml
index 21ecc21707..481032500d 100644
--- a/datasets/GM0431_oostzaan/graph_values.yml
+++ b/datasets/GM0431_oostzaan/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 432.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15496120087359946
-    :network_gas: 0.147713395195203
-    :ambient_heat: 0.6973254039311976
+    :electricity: 0.18755043801373383
+    :network_gas: 0.15602178474549233
+    :ambient_heat: 0.6564277772407738
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4100.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 37.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21561815595397826
-    :network_gas: 0.1375273761840846
-    :ambient_heat: 0.6468544678619371
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad
index f7a457371b..fbda741511 100644
--- a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad
+++ b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0432_opmeer
-- id = 128717
-- parent_id = 128717
+- id = 129405
+- parent_id = 129405
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0432_opmeer/graph_values.yml b/datasets/GM0432_opmeer/graph_values.yml
index 5d50b7a2bc..d76fb4abe5 100644
--- a/datasets/GM0432_opmeer/graph_values.yml
+++ b/datasets/GM0432_opmeer/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 768.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15461196311354355
-    :network_gas: 0.14963420287551052
-    :ambient_heat: 0.695753834010946
+    :electricity: 0.18710403551672475
+    :network_gas: 0.15803059894342708
+    :ambient_heat: 0.6548653655398482
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4957.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 9.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2151656541398629
-    :network_gas: 0.13933738344054603
-    :ambient_heat: 0.6454969624195911
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad
index 1a7a4792a3..41d1d4ef83 100644
--- a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad
+++ b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0437_ouder_amstel
-- id = 128721
-- parent_id = 128721
+- id = 129409
+- parent_id = 129409
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0437_ouder_amstel/graph_values.yml b/datasets/GM0437_ouder_amstel/graph_values.yml
index ad5d1d5267..d3a805ec72 100644
--- a/datasets/GM0437_ouder_amstel/graph_values.yml
+++ b/datasets/GM0437_ouder_amstel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3428.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.154775309779879
-    :network_gas: 0.14873579621066554
-    :ambient_heat: 0.6964888940094555
+    :electricity: 0.1873128143154464
+    :network_gas: 0.15709109296415982
+    :ambient_heat: 0.6555960927203937
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6296.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 135.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21537731732799514
-    :network_gas: 0.13849073068801718
-    :ambient_heat: 0.6461319519839877
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad
index 278a594d8b..fdbf3c2163 100644
--- a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad
+++ b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0439_purmerend
-- id = 128728
-- parent_id = 128728
+- id = 129416
+- parent_id = 129416
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0439_purmerend/graph_values.yml b/datasets/GM0439_purmerend/graph_values.yml
index 8b24b51a91..a6faa5a6ff 100644
--- a/datasets/GM0439_purmerend/graph_values.yml
+++ b/datasets/GM0439_purmerend/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5815.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.17002245423577123
-    :network_gas: 0.0648765017032582
-    :ambient_heat: 0.7651010440609706
+    :electricity: 0.20691030235776242
+    :network_gas: 0.06890226676576812
+    :ambient_heat: 0.7241874308764695
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 41148.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 463.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.23499984814158031
-    :network_gas: 0.060000607433676245
-    :ambient_heat: 0.7049995444247434
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0441_schagen/GM0441_schagen.derived.ad b/datasets/GM0441_schagen/GM0441_schagen.derived.ad
index def8cc8aca..697cd0c13b 100644
--- a/datasets/GM0441_schagen/GM0441_schagen.derived.ad
+++ b/datasets/GM0441_schagen/GM0441_schagen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0441_schagen
-- id = 128746
-- parent_id = 128746
+- id = 129434
+- parent_id = 129434
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0441_schagen/graph_values.yml b/datasets/GM0441_schagen/graph_values.yml
index 1a8d243dc7..2405296710 100644
--- a/datasets/GM0441_schagen/graph_values.yml
+++ b/datasets/GM0441_schagen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5314.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1535714480598116
-    :network_gas: 0.1553570356710363
-    :ambient_heat: 0.6910715162691522
+    :electricity: 0.18577469951212863
+    :network_gas: 0.16401261978280476
+    :ambient_heat: 0.6502126807050665
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20529.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 251.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21381664103831163
-    :network_gas: 0.14473343584675108
-    :ambient_heat: 0.6414499231149372
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0448_texel/GM0448_texel.derived.ad b/datasets/GM0448_texel/GM0448_texel.derived.ad
index fae9ab424a..c6a8c5276a 100644
--- a/datasets/GM0448_texel/GM0448_texel.derived.ad
+++ b/datasets/GM0448_texel/GM0448_texel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0448_texel
-- id = 128771
-- parent_id = 128771
+- id = 129459
+- parent_id = 129459
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0448_texel/graph_values.yml b/datasets/GM0448_texel/graph_values.yml
index 0fc5d82c43..005ed6a0b4 100644
--- a/datasets/GM0448_texel/graph_values.yml
+++ b/datasets/GM0448_texel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4968.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.151917295247268
-    :network_gas: 0.1644548761400261
-    :ambient_heat: 0.6836278286127059
+    :electricity: 0.18366345997931652
+    :network_gas: 0.17351321168623207
+    :ambient_heat: 0.6428233283344513
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6770.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 304.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21166948010254516
-    :network_gas: 0.1533220795898172
-    :ambient_heat: 0.6350084403076377
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad
index 0f455c5692..658d5313d7 100644
--- a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad
+++ b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0450_uitgeest
-- id = 128780
-- parent_id = 128780
+- id = 129468
+- parent_id = 129468
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0450_uitgeest/graph_values.yml b/datasets/GM0450_uitgeest/graph_values.yml
index 3a87c00dfa..1a9387ed04 100644
--- a/datasets/GM0450_uitgeest/graph_values.yml
+++ b/datasets/GM0450_uitgeest/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 875.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15487913761110192
-    :network_gas: 0.14816474313893968
-    :ambient_heat: 0.6969561192499586
+    :electricity: 0.187445532983521
+    :network_gas: 0.15649385807738042
+    :ambient_heat: 0.6560606089390986
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5720.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 124.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21551184053139694
-    :network_gas: 0.1379526378744101
-    :ambient_heat: 0.646535521594193
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad
index 219bee6766..65359256f9 100644
--- a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad
+++ b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0451_uithoorn
-- id = 128781
-- parent_id = 128781
+- id = 129469
+- parent_id = 129469
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0451_uithoorn/graph_values.yml b/datasets/GM0451_uithoorn/graph_values.yml
index be176e4ed0..e63415c90c 100644
--- a/datasets/GM0451_uithoorn/graph_values.yml
+++ b/datasets/GM0451_uithoorn/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2155.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15570444004488723
-    :network_gas: 0.14362557975312015
-    :ambient_heat: 0.7006699802019926
+    :electricity: 0.18850083760031625
+    :network_gas: 0.15174498030100628
+    :ambient_heat: 0.6597541820986775
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13250.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 82.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21658069112036177
-    :network_gas: 0.13367723551855054
-    :ambient_heat: 0.6497420733610877
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0453_velsen/GM0453_velsen.derived.ad b/datasets/GM0453_velsen/GM0453_velsen.derived.ad
index 5c9cc6b977..e69bb885e1 100644
--- a/datasets/GM0453_velsen/GM0453_velsen.derived.ad
+++ b/datasets/GM0453_velsen/GM0453_velsen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0453_velsen
-- id = 128792
-- parent_id = 128792
+- id = 129480
+- parent_id = 129480
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0453_velsen/graph_values.yml b/datasets/GM0453_velsen/graph_values.yml
index eb1bf276b9..99393791bb 100644
--- a/datasets/GM0453_velsen/graph_values.yml
+++ b/datasets/GM0453_velsen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6907.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1513438864064553
-    :network_gas: 0.16760862476449587
-    :ambient_heat: 0.6810474888290489
+    :electricity: 0.18293219388272108
+    :network_gas: 0.17680391397206496
+    :ambient_heat: 0.6402638921452138
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 31435.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 4067.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21092443195910882
-    :network_gas: 0.15630227216356238
-    :ambient_heat: 0.6327732958773287
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad
index 1d5e3c1956..74e67ecfe7 100644
--- a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad
+++ b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0473_zandvoort
-- id = 128825
-- parent_id = 128825
+- id = 129513
+- parent_id = 129513
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0473_zandvoort/graph_values.yml b/datasets/GM0473_zandvoort/graph_values.yml
index 1bec5e45b5..754b0b8080 100644
--- a/datasets/GM0473_zandvoort/graph_values.yml
+++ b/datasets/GM0473_zandvoort/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1395.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1501576367064158
-    :network_gas: 0.17413299811471322
-    :ambient_heat: 0.675709365178871
+    :electricity: 0.1814203387559564
+    :network_gas: 0.18360727207201688
+    :ambient_heat: 0.6349723891720268
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9695.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 723.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20938189088374
-    :network_gas: 0.16247243646503776
-    :ambient_heat: 0.6281456726512222
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad
index 0bbde96e09..2a7d396987 100644
--- a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad
+++ b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0479_zaanstad
-- id = 128823
-- parent_id = 128823
+- id = 129511
+- parent_id = 129511
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0479_zaanstad/graph_values.yml b/datasets/GM0479_zaanstad/graph_values.yml
index 20096bbe64..50a1cf81d8 100644
--- a/datasets/GM0479_zaanstad/graph_values.yml
+++ b/datasets/GM0479_zaanstad/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 14450.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15363452729551139
-    :network_gas: 0.15501009987468747
-    :ambient_heat: 0.6913553728298012
+    :electricity: 0.18585525938814249
+    :network_gas: 0.1636500998063157
+    :ambient_heat: 0.650494640805542
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 69079.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 4437.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.213898457970992
-    :network_gas: 0.14440616811602966
-    :ambient_heat: 0.6416953739129783
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad
index bbfec604ea..5bbb8c880f 100644
--- a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad
+++ b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0482_alblasserdam
-- id = 128517
-- parent_id = 128517
+- id = 129205
+- parent_id = 129205
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0482_alblasserdam/graph_values.yml b/datasets/GM0482_alblasserdam/graph_values.yml
index d2f411d7bb..ab7f9fb724 100644
--- a/datasets/GM0482_alblasserdam/graph_values.yml
+++ b/datasets/GM0482_alblasserdam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1419.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15624266086139704
-    :network_gas: 0.14066536526231627
-    :ambient_heat: 0.7030919738762867
+    :electricity: 0.18918939506622126
+    :network_gas: 0.14864646713660545
+    :ambient_heat: 0.6621641377971733
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8406.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 245.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21727731910890316
-    :network_gas: 0.13089072356438505
-    :ambient_heat: 0.6518319573267118
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad
index f243b75418..f3871b7907 100644
--- a/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad
+++ b/datasets/GM0484_alphen_aan_den_rijn/GM0484_alphen_aan_den_rijn.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0484_alphen_aan_den_rijn
-- id = 128522
-- parent_id = 128522
+- id = 129210
+- parent_id = 129210
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml
index a77c8bf2e1..66ca2ab4f1 100644
--- a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml
+++ b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 10512.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15618748365509005
-    :network_gas: 0.14096883989700468
-    :ambient_heat: 0.7028436764479052
+    :electricity: 0.18911879329744855
+    :network_gas: 0.14896417556444833
+    :ambient_heat: 0.6619170311381031
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 48847.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1649.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21720591769311767
-    :network_gas: 0.13117632922752692
-    :ambient_heat: 0.6516177530793554
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad
index 5c0fc66a58..d0c7860f15 100644
--- a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad
+++ b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0489_barendrecht
-- id = 128534
-- parent_id = 128534
+- id = 129222
+- parent_id = 129222
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0489_barendrecht/graph_values.yml b/datasets/GM0489_barendrecht/graph_values.yml
index d94f593e14..127dfd260b 100644
--- a/datasets/GM0489_barendrecht/graph_values.yml
+++ b/datasets/GM0489_barendrecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4769.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1589768348148365
-    :network_gas: 0.12562740851839937
-    :ambient_heat: 0.7153957566667641
+    :electricity: 0.1926914434285919
+    :network_gas: 0.13288722627366428
+    :ambient_heat: 0.6744213302977439
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19420.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 151.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2208110608806525
-    :network_gas: 0.11675575647738755
-    :ambient_heat: 0.6624331826419599
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad
index b5ea47f7aa..432e34fb26 100644
--- a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad
+++ b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0498_drechterland
-- id = 128586
-- parent_id = 128586
+- id = 129274
+- parent_id = 129274
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0498_drechterland/graph_values.yml b/datasets/GM0498_drechterland/graph_values.yml
index 623bb713f1..854cd5f1a8 100644
--- a/datasets/GM0498_drechterland/graph_values.yml
+++ b/datasets/GM0498_drechterland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 879.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15596350188725538
-    :network_gas: 0.14220073962009533
-    :ambient_heat: 0.7018357584926492
+    :electricity: 0.18883222739242772
+    :network_gas: 0.1502537240380946
+    :ambient_heat: 0.6609140485694778
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8399.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 11.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2169160407272426
-    :network_gas: 0.13233583709102725
-    :ambient_heat: 0.6507481221817302
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad
index bec61986c4..48a5d292b4 100644
--- a/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad
+++ b/datasets/GM0502_capelle_aan_den_ijssel/GM0502_capelle_aan_den_ijssel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0502_capelle_aan_den_ijssel
-- id = 128564
-- parent_id = 128564
+- id = 129252
+- parent_id = 129252
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml
index e305868ebc..f4903a28af 100644
--- a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml
+++ b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8475.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.16144617410548912
-    :network_gas: 0.1120460424198099
-    :ambient_heat: 0.726507783474701
+    :electricity: 0.19586026793999736
+    :network_gas: 0.1186274949506434
+    :ambient_heat: 0.6855122371093592
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 31546.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 271.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2239951523071619
-    :network_gas: 0.10401939077134999
-    :ambient_heat: 0.6719854569214881
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0503_delft/GM0503_delft.derived.ad b/datasets/GM0503_delft/GM0503_delft.derived.ad
index 3f96cb1d16..cc6d824e74 100644
--- a/datasets/GM0503_delft/GM0503_delft.derived.ad
+++ b/datasets/GM0503_delft/GM0503_delft.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0503_delft
-- id = 128575
-- parent_id = 128575
+- id = 129263
+- parent_id = 129263
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0503_delft/graph_values.yml b/datasets/GM0503_delft/graph_values.yml
index 6e6b8c662a..0d0d399eff 100644
--- a/datasets/GM0503_delft/graph_values.yml
+++ b/datasets/GM0503_delft/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 20472.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15598159475557488
-    :network_gas: 0.14210122884433807
-    :ambient_heat: 0.701917176400087
+    :electricity: 0.1888553739709205
+    :network_gas: 0.15014956428132473
+    :ambient_heat: 0.6609950617477548
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 51465.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 5113.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2169394586425922
-    :network_gas: 0.13224216542962877
-    :ambient_heat: 0.650818375927779
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad
index df1af9139e..285bd7fbc1 100644
--- a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad
+++ b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0505_dordrecht
-- id = 128585
-- parent_id = 128585
+- id = 129273
+- parent_id = 129273
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0505_dordrecht/graph_values.yml b/datasets/GM0505_dordrecht/graph_values.yml
index 362f40f265..f34ff8721a 100644
--- a/datasets/GM0505_dordrecht/graph_values.yml
+++ b/datasets/GM0505_dordrecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 14753.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1543326749493162
-    :network_gas: 0.15117028777876093
-    :ambient_heat: 0.6944970372719229
+    :electricity: 0.18674712537819257
+    :network_gas: 0.15963669693453142
+    :ambient_heat: 0.6536161776872759
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 55783.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 6233.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21480368366376212
-    :network_gas: 0.14078526534494923
-    :ambient_heat: 0.6444110509912886
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad
index 5047c1cd8a..0fcede9bdb 100644
--- a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad
+++ b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0512_gorinchem
-- id = 128614
-- parent_id = 128614
+- id = 129302
+- parent_id = 129302
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0512_gorinchem/graph_values.yml b/datasets/GM0512_gorinchem/graph_values.yml
index 2c9add2f92..23dcd53fdc 100644
--- a/datasets/GM0512_gorinchem/graph_values.yml
+++ b/datasets/GM0512_gorinchem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 7948.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1568347137427353
-    :network_gas: 0.1374090744149559
-    :ambient_heat: 0.7057562118423089
+    :electricity: 0.18994713200233837
+    :network_gas: 0.14523664589731985
+    :ambient_heat: 0.6648162221003419
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 17273.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 805.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21804323770817235
-    :network_gas: 0.12782704916730814
-    :ambient_heat: 0.6541297131245194
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0513_gouda/GM0513_gouda.derived.ad b/datasets/GM0513_gouda/GM0513_gouda.derived.ad
index 139cd3b2c8..b879e82f20 100644
--- a/datasets/GM0513_gouda/GM0513_gouda.derived.ad
+++ b/datasets/GM0513_gouda/GM0513_gouda.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0513_gouda
-- id = 128615
-- parent_id = 128615
+- id = 129303
+- parent_id = 129303
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0513_gouda/graph_values.yml b/datasets/GM0513_gouda/graph_values.yml
index 13e777d42f..d4f4c9167d 100644
--- a/datasets/GM0513_gouda/graph_values.yml
+++ b/datasets/GM0513_gouda/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 9994.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1541145142357247
-    :network_gas: 0.1523701717035141
-    :ambient_heat: 0.6935153140607613
+    :electricity: 0.18646838203819746
+    :network_gas: 0.1608910438136677
+    :ambient_heat: 0.6526405741481348
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 33708.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 4726.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21452087459839717
-    :network_gas: 0.1419165016064089
-    :ambient_heat: 0.6435626237951938
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad
index 3f96b5c4e8..bf8ba4d91e 100644
--- a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad
+++ b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0518_s_gravenhage
-- id = 128576
-- parent_id = 128576
+- id = 129264
+- parent_id = 129264
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0518_s_gravenhage/graph_values.yml b/datasets/GM0518_s_gravenhage/graph_values.yml
index 2c65bdd249..eb8ad129da 100644
--- a/datasets/GM0518_s_gravenhage/graph_values.yml
+++ b/datasets/GM0518_s_gravenhage/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 77160.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15219394164634026
-    :network_gas: 0.16293332094512852
-    :ambient_heat: 0.6848727374085312
+    :electricity: 0.184016374819548
+    :network_gas: 0.17192509256398536
+    :ambient_heat: 0.6440585326164667
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 265826.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 16816.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21202879932978472
-    :network_gas: 0.15188480268085894
-    :ambient_heat: 0.6360863979893564
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad
index 29caca1123..8bf256f197 100644
--- a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad
+++ b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0523_hardinxveld_giessendam
-- id = 128624
-- parent_id = 128624
+- id = 129312
+- parent_id = 129312
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml
index 1c746ae119..2ba3f86d73 100644
--- a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml
+++ b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1962.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1556523405304498
-    :network_gas: 0.1439121270825262
-    :ambient_heat: 0.700435532387024
+    :electricity: 0.18843419985613477
+    :network_gas: 0.1520448505918917
+    :ambient_heat: 0.6595209495519736
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7508.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 129.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21651324015953852
-    :network_gas: 0.13394703936184374
-    :ambient_heat: 0.6495397204786179
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad
index 2e4fc94af9..07dd4dc588 100644
--- a/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad
+++ b/datasets/GM0531_hendrik_ido_ambacht/GM0531_hendrik_ido_ambacht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0531_hendrik_ido_ambacht
-- id = 128636
-- parent_id = 128636
+- id = 129324
+- parent_id = 129324
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml
index b7907bd465..ec4873107a 100644
--- a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml
+++ b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1615.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15858780501097333
-    :network_gas: 0.12776707243964652
-    :ambient_heat: 0.71364512254938
+    :electricity: 0.1921927325027001
+    :network_gas: 0.13513142874858072
+    :ambient_heat: 0.6726758387487192
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12330.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 78.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2203087890633568
-    :network_gas: 0.11876484374657048
-    :ambient_heat: 0.6609263671900727
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad
index 2d45d3cdef..0c3226b779 100644
--- a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad
+++ b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0532_stede_broec
-- id = 128763
-- parent_id = 128763
+- id = 129451
+- parent_id = 129451
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0532_stede_broec/graph_values.yml b/datasets/GM0532_stede_broec/graph_values.yml
index 02804cd3ce..7ab0f2a687 100644
--- a/datasets/GM0532_stede_broec/graph_values.yml
+++ b/datasets/GM0532_stede_broec/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1870.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1548214547602405
-    :network_gas: 0.14848199881867713
-    :ambient_heat: 0.6966965464210824
+    :electricity: 0.18737179823180064
+    :network_gas: 0.1568256649492719
+    :ambient_heat: 0.6558025368189275
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9251.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 38.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21543710601719193
-    :network_gas: 0.13825157593123003
-    :ambient_heat: 0.646311318051578
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad
index a0101844c0..4537774779 100644
--- a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad
+++ b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0534_hillegom
-- id = 128640
-- parent_id = 128640
+- id = 129328
+- parent_id = 129328
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0534_hillegom/graph_values.yml b/datasets/GM0534_hillegom/graph_values.yml
index dc883d09b5..fdba52499e 100644
--- a/datasets/GM0534_hillegom/graph_values.yml
+++ b/datasets/GM0534_hillegom/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1472.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15495521779320137
-    :network_gas: 0.1477463021373925
-    :ambient_heat: 0.6972984800694062
+    :electricity: 0.18754278937116825
+    :network_gas: 0.15605620368777784
+    :ambient_heat: 0.656401006941054
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9858.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 832.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2156104049559558
-    :network_gas: 0.13755838017617456
-    :ambient_heat: 0.6468312148678697
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad
index 244e693dbf..beb39a0eca 100644
--- a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad
+++ b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0537_katwijk
-- id = 128655
-- parent_id = 128655
+- id = 129343
+- parent_id = 129343
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0537_katwijk/graph_values.yml b/datasets/GM0537_katwijk/graph_values.yml
index c4f32824d3..8d21660b47 100644
--- a/datasets/GM0537_katwijk/graph_values.yml
+++ b/datasets/GM0537_katwijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4824.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15602664665216393
-    :network_gas: 0.14185344341309833
-    :ambient_heat: 0.7021199099347377
+    :electricity: 0.18891301111016295
+    :network_gas: 0.14989019677237392
+    :ambient_heat: 0.6611967921174631
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 27160.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1783.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2169977684611615
-    :network_gas: 0.13200892615535167
-    :ambient_heat: 0.6509933053834868
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad
index bdbd8e0a37..5f8af053f3 100644
--- a/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad
+++ b/datasets/GM0542_krimpen_aan_den_ijssel/GM0542_krimpen_aan_den_ijssel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0542_krimpen_aan_den_ijssel
-- id = 128658
-- parent_id = 128658
+- id = 129346
+- parent_id = 129346
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml
index 69c8fd7efb..8cb96dba1d 100644
--- a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml
+++ b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1847.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15588337557136975
-    :network_gas: 0.14264143435746643
-    :ambient_heat: 0.7014751900711639
+    :electricity: 0.18872972380454003
+    :network_gas: 0.1507149908635887
+    :ambient_heat: 0.6605552853318712
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12643.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 113.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2168123273066475
-    :network_gas: 0.13275069077340756
-    :ambient_heat: 0.6504369819199449
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0546_leiden/GM0546_leiden.derived.ad b/datasets/GM0546_leiden/GM0546_leiden.derived.ad
index 96f1f0e462..f30d1d810c 100644
--- a/datasets/GM0546_leiden/GM0546_leiden.derived.ad
+++ b/datasets/GM0546_leiden/GM0546_leiden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0546_leiden
-- id = 128666
-- parent_id = 128666
+- id = 129354
+- parent_id = 129354
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0546_leiden/graph_values.yml b/datasets/GM0546_leiden/graph_values.yml
index fc40fe1968..7c5329add5 100644
--- a/datasets/GM0546_leiden/graph_values.yml
+++ b/datasets/GM0546_leiden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 21275.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15625314653285075
-    :network_gas: 0.140607694069321
-    :ambient_heat: 0.7031391593978283
+    :electricity: 0.18920281228419186
+    :network_gas: 0.148586089566729
+    :ambient_heat: 0.6622110981490791
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 60499.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 9342.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21729088757264192
-    :network_gas: 0.13083644970942987
-    :ambient_heat: 0.6518726627179282
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad
index bd2e2122c1..a720a81af0 100644
--- a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad
+++ b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0547_leiderdorp
-- id = 128667
-- parent_id = 128667
+- id = 129355
+- parent_id = 129355
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0547_leiderdorp/graph_values.yml b/datasets/GM0547_leiderdorp/graph_values.yml
index 0f4fb1bf62..861b760b15 100644
--- a/datasets/GM0547_leiderdorp/graph_values.yml
+++ b/datasets/GM0547_leiderdorp/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3246.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15629330004313136
-    :network_gas: 0.14038684976277754
-    :ambient_heat: 0.7033198501940912
+    :electricity: 0.18925419271408916
+    :network_gas: 0.14835487729133798
+    :ambient_heat: 0.6623909299945727
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12376.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 379.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2173428450634538
-    :network_gas: 0.1306286197461824
-    :ambient_heat: 0.6520285351903637
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0553_lisse/GM0553_lisse.derived.ad b/datasets/GM0553_lisse/GM0553_lisse.derived.ad
index 7f7c51cfd6..d78a5177c0 100644
--- a/datasets/GM0553_lisse/GM0553_lisse.derived.ad
+++ b/datasets/GM0553_lisse/GM0553_lisse.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0553_lisse
-- id = 128673
-- parent_id = 128673
+- id = 129361
+- parent_id = 129361
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0553_lisse/graph_values.yml b/datasets/GM0553_lisse/graph_values.yml
index 2ae345046b..ff36aefcbc 100644
--- a/datasets/GM0553_lisse/graph_values.yml
+++ b/datasets/GM0553_lisse/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2689.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15589554142907805
-    :network_gas: 0.14257452214007071
-    :ambient_heat: 0.7015299364308512
+    :electricity: 0.18874528689737402
+    :network_gas: 0.15064495684259174
+    :ambient_heat: 0.6606097562600343
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10408.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 487.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2168280749526796
-    :network_gas: 0.13268770018927925
-    :ambient_heat: 0.6504842248580411
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad
index 1d8f596d10..274ba015aa 100644
--- a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad
+++ b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0556_maassluis
-- id = 128680
-- parent_id = 128680
+- id = 129368
+- parent_id = 129368
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0556_maassluis/graph_values.yml b/datasets/GM0556_maassluis/graph_values.yml
index 741bc25f5a..54107a507e 100644
--- a/datasets/GM0556_maassluis/graph_values.yml
+++ b/datasets/GM0556_maassluis/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2200.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15680049187258802
-    :network_gas: 0.13759729470076587
-    :ambient_heat: 0.7056022134266461
+    :electricity: 0.18990332438001817
+    :network_gas: 0.14543378048837674
+    :ambient_heat: 0.6646628951316051
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15387.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 792.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21799897702395526
-    :network_gas: 0.12800409190417664
-    :ambient_heat: 0.6539969310718682
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad
index 4215ef26fb..c5602a7f4e 100644
--- a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad
+++ b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0569_nieuwkoop
-- id = 128695
-- parent_id = 128695
+- id = 129383
+- parent_id = 129383
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0569_nieuwkoop/graph_values.yml b/datasets/GM0569_nieuwkoop/graph_values.yml
index ce59cedbce..c1fd8776fb 100644
--- a/datasets/GM0569_nieuwkoop/graph_values.yml
+++ b/datasets/GM0569_nieuwkoop/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1932.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15692322981290432
-    :network_gas: 0.13692223602902612
-    :ambient_heat: 0.7061545341580695
+    :electricity: 0.19006044700909522
+    :network_gas: 0.1447267276151925
+    :ambient_heat: 0.6652128253757122
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11633.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 26.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21815771327645647
-    :network_gas: 0.12736914689417178
-    :ambient_heat: 0.6544731398293717
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad
index 8b6cc7730c..47dadc5a54 100644
--- a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad
+++ b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0575_noordwijk
-- id = 128702
-- parent_id = 128702
+- id = 129390
+- parent_id = 129390
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0575_noordwijk/graph_values.yml b/datasets/GM0575_noordwijk/graph_values.yml
index e0ef2aad8b..0e6f23e945 100644
--- a/datasets/GM0575_noordwijk/graph_values.yml
+++ b/datasets/GM0575_noordwijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5595.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15426484633454238
-    :network_gas: 0.15154334516001683
-    :ambient_heat: 0.6941918085054408
+    :electricity: 0.1866604562170364
+    :network_gas: 0.16002670873468966
+    :ambient_heat: 0.6533128350482739
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20093.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 864.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21471576103479315
-    :network_gas: 0.14113695586082528
-    :ambient_heat: 0.6441472831043816
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad
index d5b6964ae2..8fde179088 100644
--- a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad
+++ b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0579_oegstgeest
-- id = 128705
-- parent_id = 128705
+- id = 129393
+- parent_id = 129393
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0579_oegstgeest/graph_values.yml b/datasets/GM0579_oegstgeest/graph_values.yml
index f9013934cd..660aa2b877 100644
--- a/datasets/GM0579_oegstgeest/graph_values.yml
+++ b/datasets/GM0579_oegstgeest/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2024.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1552455675865343
-    :network_gas: 0.1461493782740614
-    :ambient_heat: 0.6986050541394042
+    :electricity: 0.1879140046795567
+    :network_gas: 0.1543857323374207
+    :ambient_heat: 0.6577002629830225
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11008.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 700.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2159865015105192
-    :network_gas: 0.13605399395792084
-    :ambient_heat: 0.6479595045315599
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad
index 70e87893a0..7d1f6a750c 100644
--- a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad
+++ b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0589_oudewater
-- id = 128722
-- parent_id = 128722
+- id = 129410
+- parent_id = 129410
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0589_oudewater/graph_values.yml b/datasets/GM0589_oudewater/graph_values.yml
index dc48da9f3a..c4c9588fdb 100644
--- a/datasets/GM0589_oudewater/graph_values.yml
+++ b/datasets/GM0589_oudewater/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 670.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15458275482888156
-    :network_gas: 0.14979484844115137
-    :ambient_heat: 0.6956223967299671
+    :electricity: 0.18706670604700104
+    :network_gas: 0.15819858180482424
+    :ambient_heat: 0.6547347121481748
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4315.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 304.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21512780305526238
-    :network_gas: 0.13948878777894816
-    :ambient_heat: 0.6453834091657895
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad
index d677b11518..7b5c0606e1 100644
--- a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad
+++ b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0590_papendrecht
-- id = 128724
-- parent_id = 128724
+- id = 129412
+- parent_id = 129412
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0590_papendrecht/graph_values.yml b/datasets/GM0590_papendrecht/graph_values.yml
index 4bc8b8ec53..13295b9977 100644
--- a/datasets/GM0590_papendrecht/graph_values.yml
+++ b/datasets/GM0590_papendrecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2482.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15738135164694622
-    :network_gas: 0.13440256594179587
-    :ambient_heat: 0.708216082411258
+    :electricity: 0.19064703414286496
+    :network_gas: 0.14208708162186232
+    :ambient_heat: 0.6672658842352726
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14474.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 112.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2187500465524956
-    :network_gas: 0.12499981379001522
-    :ambient_heat: 0.6562501396574891
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad
index 4a9d57312f..2fdfb30c86 100644
--- a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad
+++ b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0597_ridderkerk
-- id = 128737
-- parent_id = 128737
+- id = 129425
+- parent_id = 129425
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0597_ridderkerk/graph_values.yml b/datasets/GM0597_ridderkerk/graph_values.yml
index 180f9bf454..9a6390edf1 100644
--- a/datasets/GM0597_ridderkerk/graph_values.yml
+++ b/datasets/GM0597_ridderkerk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4254.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15699989317181878
-    :network_gas: 0.13650058755499672
-    :ambient_heat: 0.7064995192731846
+    :electricity: 0.19015859450077194
+    :network_gas: 0.14428506325154564
+    :ambient_heat: 0.6655563422476825
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 21285.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 656.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21825685275541565
-    :network_gas: 0.12697258897833497
-    :ambient_heat: 0.6547705582662493
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad
index 0954b3d096..3e22b0e921 100644
--- a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad
+++ b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0599_rotterdam
-- id = 128743
-- parent_id = 128743
+- id = 129431
+- parent_id = 129431
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0599_rotterdam/graph_values.yml b/datasets/GM0599_rotterdam/graph_values.yml
index 8c232ec7a7..d06f648003 100644
--- a/datasets/GM0599_rotterdam/graph_values.yml
+++ b/datasets/GM0599_rotterdam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 111958.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15627857335777026
-    :network_gas: 0.14046784653226377
-    :ambient_heat: 0.7032535801099661
+    :electricity: 0.1892353482741809
+    :network_gas: 0.14843967739593755
+    :ambient_heat: 0.6623249743298816
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 317566.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 14168.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2173237893704079
-    :network_gas: 0.1307048425183662
-    :ambient_heat: 0.651971368111226
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad
index 0b7351edb4..b3fc86dec0 100644
--- a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad
+++ b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0603_rijswijk
-- id = 128739
-- parent_id = 128739
+- id = 129427
+- parent_id = 129427
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0603_rijswijk/graph_values.yml b/datasets/GM0603_rijswijk/graph_values.yml
index 2a7c87f1ac..7e0de3da15 100644
--- a/datasets/GM0603_rijswijk/graph_values.yml
+++ b/datasets/GM0603_rijswijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 18055.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15424888366482484
-    :network_gas: 0.1516311398434633
-    :ambient_heat: 0.6941199764917118
+    :electricity: 0.18664006026566843
+    :network_gas: 0.1601184906511504
+    :ambient_heat: 0.653241449083181
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 27201.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1518.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21469506870250646
-    :network_gas: 0.1412197251899719
-    :ambient_heat: 0.6440852061075216
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad
index fd249c2103..7c05272487 100644
--- a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad
+++ b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0606_schiedam
-- id = 128748
-- parent_id = 128748
+- id = 129436
+- parent_id = 129436
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0606_schiedam/graph_values.yml b/datasets/GM0606_schiedam/graph_values.yml
index 4408a3b8bf..250d133c9f 100644
--- a/datasets/GM0606_schiedam/graph_values.yml
+++ b/datasets/GM0606_schiedam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8634.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15370657773935573
-    :network_gas: 0.15461382243354344
-    :ambient_heat: 0.6916795998271008
+    :electricity: 0.18594728110216752
+    :network_gas: 0.16323600148273917
+    :ambient_heat: 0.6508167174150933
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 37452.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 3154.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21399190538787635
-    :network_gas: 0.14403237844849234
-    :ambient_heat: 0.6419757161636314
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad
index 45caf41444..96d9bc6ce5 100644
--- a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad
+++ b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0610_sliedrecht
-- id = 128755
-- parent_id = 128755
+- id = 129443
+- parent_id = 129443
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0610_sliedrecht/graph_values.yml b/datasets/GM0610_sliedrecht/graph_values.yml
index a71e6143d4..45340fc0a7 100644
--- a/datasets/GM0610_sliedrecht/graph_values.yml
+++ b/datasets/GM0610_sliedrecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3206.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15643281746201168
-    :network_gas: 0.13961950395893563
-    :ambient_heat: 0.7039476785790526
+    :electricity: 0.18943273084577597
+    :network_gas: 0.14755145451434157
+    :ambient_heat: 0.6630158146398825
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11078.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 522.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2175233621777653
-    :network_gas: 0.1299065512889365
-    :ambient_heat: 0.6525700865332982
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad
index 669728cb15..1e26daf650 100644
--- a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad
+++ b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0613_albrandswaard
-- id = 128518
-- parent_id = 128518
+- id = 129206
+- parent_id = 129206
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0613_albrandswaard/graph_values.yml b/datasets/GM0613_albrandswaard/graph_values.yml
index 57817154df..2e08d704e0 100644
--- a/datasets/GM0613_albrandswaard/graph_values.yml
+++ b/datasets/GM0613_albrandswaard/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1574.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1570775142367521
-    :network_gas: 0.13607367169786355
-    :ambient_heat: 0.7068488140653844
+    :electricity: 0.19025797365521765
+    :network_gas: 0.14383785639726748
+    :ambient_heat: 0.6659041699475148
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10558.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 55.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21835722383495257
-    :network_gas: 0.1265711046601874
-    :ambient_heat: 0.65507167150486
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad
index acde3c4440..bb1b8e6a04 100644
--- a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad
+++ b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0622_vlaardingen
-- id = 128795
-- parent_id = 128795
+- id = 129483
+- parent_id = 129483
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0622_vlaardingen/graph_values.yml b/datasets/GM0622_vlaardingen/graph_values.yml
index 70bf741eb1..08150c0c3d 100644
--- a/datasets/GM0622_vlaardingen/graph_values.yml
+++ b/datasets/GM0622_vlaardingen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6581.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15341714749372018
-    :network_gas: 0.15620568878453897
-    :ambient_heat: 0.6903771637217408
+    :electricity: 0.18557765441342303
+    :network_gas: 0.16489932403415944
+    :ambient_heat: 0.6495230215524175
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 35541.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2660.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2136164860912618
-    :network_gas: 0.1455340556349505
-    :ambient_heat: 0.6408494582737877
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad
index 40643589b2..217777096a 100644
--- a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad
+++ b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0626_voorschoten
-- id = 128799
-- parent_id = 128799
+- id = 129487
+- parent_id = 129487
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0626_voorschoten/graph_values.yml b/datasets/GM0626_voorschoten/graph_values.yml
index c0d383dc08..dc21731ef9 100644
--- a/datasets/GM0626_voorschoten/graph_values.yml
+++ b/datasets/GM0626_voorschoten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1911.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15319467378659438
-    :network_gas: 0.157429294173731
-    :ambient_heat: 0.6893760320396747
+    :electricity: 0.18529358959507097
+    :network_gas: 0.16617761760120406
+    :ambient_heat: 0.648528792803725
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11502.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 696.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2133278501771498
-    :network_gas: 0.1466885992913986
-    :ambient_heat: 0.6399835505314517
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad
index 49c440ec29..664194bd05 100644
--- a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad
+++ b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0627_waddinxveen
-- id = 128804
-- parent_id = 128804
+- id = 129492
+- parent_id = 129492
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0627_waddinxveen/graph_values.yml b/datasets/GM0627_waddinxveen/graph_values.yml
index da613c132d..eee560dd89 100644
--- a/datasets/GM0627_waddinxveen/graph_values.yml
+++ b/datasets/GM0627_waddinxveen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2681.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.16007288346850856
-    :network_gas: 0.119599140923203
-    :ambient_heat: 0.7203279756082885
+    :electricity: 0.1940972653687841
+    :network_gas: 0.12656101821670332
+    :ambient_heat: 0.6793417164145126
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12786.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 221.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2222252233821721
-    :network_gas: 0.11109910647130924
-    :ambient_heat: 0.6666756701465186
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad
index 9b24ea92ba..e64caaaf30 100644
--- a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad
+++ b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0629_wassenaar
-- id = 128806
-- parent_id = 128806
+- id = 129494
+- parent_id = 129494
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0629_wassenaar/graph_values.yml b/datasets/GM0629_wassenaar/graph_values.yml
index 4577ec12fb..e7117fefc6 100644
--- a/datasets/GM0629_wassenaar/graph_values.yml
+++ b/datasets/GM0629_wassenaar/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3085.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14728359739853053
-    :network_gas: 0.18994021430808217
-    :ambient_heat: 0.6627761882933874
+    :electricity: 0.177762807701468
+    :network_gas: 0.200066186080946
+    :ambient_heat: 0.6221710062175859
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12255.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1596.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20563785501024306
-    :network_gas: 0.17744857995902555
-    :ambient_heat: 0.6169135650307314
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0632_woerden/GM0632_woerden.derived.ad b/datasets/GM0632_woerden/GM0632_woerden.derived.ad
index 533a09bb47..1ada58332f 100644
--- a/datasets/GM0632_woerden/GM0632_woerden.derived.ad
+++ b/datasets/GM0632_woerden/GM0632_woerden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0632_woerden
-- id = 128820
-- parent_id = 128820
+- id = 129508
+- parent_id = 129508
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0632_woerden/graph_values.yml b/datasets/GM0632_woerden/graph_values.yml
index b8ab13ae16..c42c49bb3d 100644
--- a/datasets/GM0632_woerden/graph_values.yml
+++ b/datasets/GM0632_woerden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5840.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1555923701602013
-    :network_gas: 0.1442419641188928
-    :ambient_heat: 0.7001656657209059
+    :electricity: 0.1883574980358847
+    :network_gas: 0.15239000929184982
+    :ambient_heat: 0.6592524926722655
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22411.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 901.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2164355952752528
-    :network_gas: 0.13425761889898644
-    :ambient_heat: 0.6493067858257607
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad
index 365899af82..4c1a9ca56b 100644
--- a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad
+++ b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0637_zoetermeer
-- id = 128829
-- parent_id = 128829
+- id = 129517
+- parent_id = 129517
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0637_zoetermeer/graph_values.yml b/datasets/GM0637_zoetermeer/graph_values.yml
index d5db57913e..eb7b98ea96 100644
--- a/datasets/GM0637_zoetermeer/graph_values.yml
+++ b/datasets/GM0637_zoetermeer/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 14283.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1589736645716735
-    :network_gas: 0.12564484485579588
-    :ambient_heat: 0.7153814905725308
+    :electricity: 0.19268737881286171
+    :network_gas: 0.13290551707141454
+    :ambient_heat: 0.6744071041157239
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 56357.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 142.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22080696851844453
-    :network_gas: 0.11677212592621951
-    :ambient_heat: 0.662420905555336
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad
index 6f5ad0e60e..67f3ae503d 100644
--- a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad
+++ b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0638_zoeterwoude
-- id = 128830
-- parent_id = 128830
+- id = 129518
+- parent_id = 129518
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0638_zoeterwoude/graph_values.yml b/datasets/GM0638_zoeterwoude/graph_values.yml
index e1a4744d85..ead87f226f 100644
--- a/datasets/GM0638_zoeterwoude/graph_values.yml
+++ b/datasets/GM0638_zoeterwoude/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1553.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15825854136719514
-    :network_gas: 0.12957802248042674
-    :ambient_heat: 0.7121634361523781
+    :electricity: 0.19177074809065908
+    :network_gas: 0.13703036140217173
+    :ambient_heat: 0.6711988905071691
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 3732.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 99.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2198835449510983
-    :network_gas: 0.12046582019560452
-    :ambient_heat: 0.6596506348532972
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad
index 27f0f64256..fed48b5253 100644
--- a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad
+++ b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0642_zwijndrecht
-- id = 128835
-- parent_id = 128835
+- id = 129523
+- parent_id = 129523
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0642_zwijndrecht/graph_values.yml b/datasets/GM0642_zwijndrecht/graph_values.yml
index f491b9e212..859f804242 100644
--- a/datasets/GM0642_zwijndrecht/graph_values.yml
+++ b/datasets/GM0642_zwijndrecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3656.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15406130350122285
-    :network_gas: 0.15266283074327425
-    :ambient_heat: 0.6932758657555028
+    :electricity: 0.1864004015245683
+    :network_gas: 0.16119695657597563
+    :ambient_heat: 0.6524026418994561
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20717.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 623.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21445188740158472
-    :network_gas: 0.14219245039365885
-    :ambient_heat: 0.6433556622047564
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0654_borsele/GM0654_borsele.derived.ad b/datasets/GM0654_borsele/GM0654_borsele.derived.ad
index f241aa4486..8b3aa30985 100644
--- a/datasets/GM0654_borsele/GM0654_borsele.derived.ad
+++ b/datasets/GM0654_borsele/GM0654_borsele.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0654_borsele
-- id = 128555
-- parent_id = 128555
+- id = 129243
+- parent_id = 129243
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0654_borsele/graph_values.yml b/datasets/GM0654_borsele/graph_values.yml
index da500445f9..3938d018dd 100644
--- a/datasets/GM0654_borsele/graph_values.yml
+++ b/datasets/GM0654_borsele/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1657.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15294975750399806
-    :network_gas: 0.1587763337280106
-    :ambient_heat: 0.6882739087679912
+    :electricity: 0.18498092206261202
+    :network_gas: 0.1675846235714776
+    :ambient_heat: 0.6474344543659104
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9820.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 225.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21301003126587634
-    :network_gas: 0.1479598749364925
-    :ambient_heat: 0.6390300937976312
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0664_goes/GM0664_goes.derived.ad b/datasets/GM0664_goes/GM0664_goes.derived.ad
index 8728ad4278..67ddc7816f 100644
--- a/datasets/GM0664_goes/GM0664_goes.derived.ad
+++ b/datasets/GM0664_goes/GM0664_goes.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0664_goes
-- id = 128611
-- parent_id = 128611
+- id = 129299
+- parent_id = 129299
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0664_goes/graph_values.yml b/datasets/GM0664_goes/graph_values.yml
index c0bd961c77..34825ff27e 100644
--- a/datasets/GM0664_goes/graph_values.yml
+++ b/datasets/GM0664_goes/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6024.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15682848892886744
-    :network_gas: 0.13744331089122913
-    :ambient_heat: 0.7057282001799035
+    :electricity: 0.18993916349954154
+    :network_gas: 0.14527250421276797
+    :ambient_heat: 0.6647883322876905
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18622.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 889.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21803518697657828
-    :network_gas: 0.12785925209368443
-    :ambient_heat: 0.6541055609297372
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad
index 662cd21158..3d0d79252d 100644
--- a/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad
+++ b/datasets/GM0668_west_maas_en_waal/GM0668_west_maas_en_waal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0668_west_maas_en_waal
-- id = 128809
-- parent_id = 128809
+- id = 129497
+- parent_id = 129497
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0668_west_maas_en_waal/graph_values.yml b/datasets/GM0668_west_maas_en_waal/graph_values.yml
index f14de6432c..4a58fe3308 100644
--- a/datasets/GM0668_west_maas_en_waal/graph_values.yml
+++ b/datasets/GM0668_west_maas_en_waal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1312.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15688103549636134
-    :network_gas: 0.13715430477001272
-    :ambient_heat: 0.705964659733626
+    :electricity: 0.1900064304932152
+    :network_gas: 0.14496980229499334
+    :ambient_heat: 0.6650237672117915
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8346.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 37.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2181031455705715
-    :network_gas: 0.12758741771771162
-    :ambient_heat: 0.6543094367117168
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0677_hulst/GM0677_hulst.derived.ad b/datasets/GM0677_hulst/GM0677_hulst.derived.ad
index 79df5c79b0..db1c183006 100644
--- a/datasets/GM0677_hulst/GM0677_hulst.derived.ad
+++ b/datasets/GM0677_hulst/GM0677_hulst.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0677_hulst
-- id = 128650
-- parent_id = 128650
+- id = 129338
+- parent_id = 129338
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0677_hulst/graph_values.yml b/datasets/GM0677_hulst/graph_values.yml
index 02f75bd084..9ad21fb600 100644
--- a/datasets/GM0677_hulst/graph_values.yml
+++ b/datasets/GM0677_hulst/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2020.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15378090364500197
-    :network_gas: 0.1542050299524892
-    :ambient_heat: 0.6920140664025088
+    :electricity: 0.1860422140422789
+    :network_gas: 0.1628088026224613
+    :ambient_heat: 0.6511489833352597
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13607.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 391.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21408829773279095
-    :network_gas: 0.1436468090688341
-    :ambient_heat: 0.6422648931983751
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad
index 3b97828145..f9e4fa0f4a 100644
--- a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad
+++ b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0678_kapelle
-- id = 128654
-- parent_id = 128654
+- id = 129342
+- parent_id = 129342
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0678_kapelle/graph_values.yml b/datasets/GM0678_kapelle/graph_values.yml
index d2e33106bd..1985c88f74 100644
--- a/datasets/GM0678_kapelle/graph_values.yml
+++ b/datasets/GM0678_kapelle/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 947.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15685567618473606
-    :network_gas: 0.13729378098395187
-    :ambient_heat: 0.7058505428313122
+    :electricity: 0.18997396668860758
+    :network_gas: 0.14511588963108954
+    :ambient_heat: 0.6649101436803029
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5456.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 98.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2180703487122359
-    :network_gas: 0.1277186051510541
-    :ambient_heat: 0.65421104613671
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad
index 924dc5609e..306409a6be 100644
--- a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad
+++ b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0687_middelburg
-- id = 128685
-- parent_id = 128685
+- id = 129373
+- parent_id = 129373
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0687_middelburg/graph_values.yml b/datasets/GM0687_middelburg/graph_values.yml
index d3c43a8029..fa6a5241e8 100644
--- a/datasets/GM0687_middelburg/graph_values.yml
+++ b/datasets/GM0687_middelburg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6622.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15181116010362944
-    :network_gas: 0.16503861943003806
-    :ambient_heat: 0.6831502204663324
+    :electricity: 0.1835280833066845
+    :network_gas: 0.17412240761115289
+    :ambient_heat: 0.6423495090821626
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 23882.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2427.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2115316040877635
-    :network_gas: 0.15387358364894374
-    :ambient_heat: 0.6345948122632927
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad
index db70e6b789..52b4622685 100644
--- a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad
+++ b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0703_reimerswaal
-- id = 128731
-- parent_id = 128731
+- id = 129419
+- parent_id = 129419
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0703_reimerswaal/graph_values.yml b/datasets/GM0703_reimerswaal/graph_values.yml
index 1ffe25526b..8adecd87d7 100644
--- a/datasets/GM0703_reimerswaal/graph_values.yml
+++ b/datasets/GM0703_reimerswaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1193.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15328757589516473
-    :network_gas: 0.15691833257659407
-    :ambient_heat: 0.6897940915282412
+    :electricity: 0.1854122057701358
+    :network_gas: 0.16564384402652335
+    :ambient_heat: 0.6489439502033408
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9322.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 239.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21344838771241115
-    :network_gas: 0.14620644915035305
-    :ambient_heat: 0.6403451631372358
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad
index ec36727c08..6046babffd 100644
--- a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad
+++ b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0715_terneuzen
-- id = 128769
-- parent_id = 128769
+- id = 129457
+- parent_id = 129457
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0715_terneuzen/graph_values.yml b/datasets/GM0715_terneuzen/graph_values.yml
index 23576a9e4e..93a46cb191 100644
--- a/datasets/GM0715_terneuzen/graph_values.yml
+++ b/datasets/GM0715_terneuzen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 10482.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15032777778926773
-    :network_gas: 0.17319722215902747
-    :ambient_heat: 0.6764750000517048
+    :electricity: 0.18163710083956855
+    :network_gas: 0.18263184125778203
+    :ambient_heat: 0.6357310579026494
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 27046.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1594.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20960323427032673
-    :network_gas: 0.16158706291869077
-    :ambient_heat: 0.6288097028109825
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0716_tholen/GM0716_tholen.derived.ad b/datasets/GM0716_tholen/GM0716_tholen.derived.ad
index 70115c2feb..046d30035c 100644
--- a/datasets/GM0716_tholen/GM0716_tholen.derived.ad
+++ b/datasets/GM0716_tholen/GM0716_tholen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0716_tholen
-- id = 128773
-- parent_id = 128773
+- id = 129461
+- parent_id = 129461
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0716_tholen/graph_values.yml b/datasets/GM0716_tholen/graph_values.yml
index fef34239e8..dd96fbfd5b 100644
--- a/datasets/GM0716_tholen/graph_values.yml
+++ b/datasets/GM0716_tholen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2126.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15627001262608697
-    :network_gas: 0.14051493055652162
-    :ambient_heat: 0.7032150568173914
+    :electricity: 0.18922439395380508
+    :network_gas: 0.14848897191029883
+    :ambient_heat: 0.6622866341358962
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11102.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1132.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21731271203964853
-    :network_gas: 0.1307491518414036
-    :ambient_heat: 0.6519381361189479
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0717_veere/GM0717_veere.derived.ad b/datasets/GM0717_veere/GM0717_veere.derived.ad
index 7f4b5d7c07..33d11bc53a 100644
--- a/datasets/GM0717_veere/GM0717_veere.derived.ad
+++ b/datasets/GM0717_veere/GM0717_veere.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0717_veere
-- id = 128790
-- parent_id = 128790
+- id = 129478
+- parent_id = 129478
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0717_veere/graph_values.yml b/datasets/GM0717_veere/graph_values.yml
index 32f26b5b0d..51fe6f1ffb 100644
--- a/datasets/GM0717_veere/graph_values.yml
+++ b/datasets/GM0717_veere/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4753.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15319827337194358
-    :network_gas: 0.15740949645431038
-    :ambient_heat: 0.6893922301737461
+    :electricity: 0.18529818534883186
+    :network_gas: 0.1661569366787923
+    :ambient_heat: 0.6485448779723758
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10972.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 248.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21333252071056033
-    :network_gas: 0.14666991715775635
-    :ambient_heat: 0.6399975621316834
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad
index d186d56130..4348fa119e 100644
--- a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad
+++ b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0718_vlissingen
-- id = 128797
-- parent_id = 128797
+- id = 129485
+- parent_id = 129485
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0718_vlissingen/graph_values.yml b/datasets/GM0718_vlissingen/graph_values.yml
index e79b59b27f..5d58dfbd63 100644
--- a/datasets/GM0718_vlissingen/graph_values.yml
+++ b/datasets/GM0718_vlissingen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5922.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15339556275016772
-    :network_gas: 0.1563244048740775
-    :ambient_heat: 0.6902800323757546
+    :electricity: 0.1855500919964024
+    :network_gas: 0.16502335509359878
+    :ambient_heat: 0.6494265529099987
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22881.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1741.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2135884846931195
-    :network_gas: 0.14564606122751975
-    :ambient_heat: 0.6407654540793608
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad
index 07ed4a35bf..c91376be71 100644
--- a/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad
+++ b/datasets/GM0736_de_ronde_venen/GM0736_de_ronde_venen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0736_de_ronde_venen
-- id = 128573
-- parent_id = 128573
+- id = 129261
+- parent_id = 129261
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0736_de_ronde_venen/graph_values.yml b/datasets/GM0736_de_ronde_venen/graph_values.yml
index 9054cafb70..65340be439 100644
--- a/datasets/GM0736_de_ronde_venen/graph_values.yml
+++ b/datasets/GM0736_de_ronde_venen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3547.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15554169693905395
-    :network_gas: 0.14452066683520332
-    :ambient_heat: 0.6999376362257428
+    :electricity: 0.1882926898288056
+    :network_gas: 0.15268164665363762
+    :ambient_heat: 0.6590256635175568
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18550.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 162.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2163699843735996
-    :network_gas: 0.13452006250559911
-    :ambient_heat: 0.6491099531208012
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad
index b3546856c8..4ea6e051af 100644
--- a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad
+++ b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0737_tytsjerksteradiel
-- id = 128779
-- parent_id = 128779
+- id = 129467
+- parent_id = 129467
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0737_tytsjerksteradiel/graph_values.yml b/datasets/GM0737_tytsjerksteradiel/graph_values.yml
index 6482725a7c..d34100fc14 100644
--- a/datasets/GM0737_tytsjerksteradiel/graph_values.yml
+++ b/datasets/GM0737_tytsjerksteradiel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2519.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15211845206238703
-    :network_gas: 0.16334851365687136
-    :ambient_heat: 0.6845330342807416
+    :electricity: 0.18392006654389098
+    :network_gas: 0.17235848044334226
+    :ambient_heat: 0.6437214530127667
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14018.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 47.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21193075927612312
-    :network_gas: 0.15227696289550519
-    :ambient_heat: 0.6357922778283717
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0743_asten/GM0743_asten.derived.ad b/datasets/GM0743_asten/GM0743_asten.derived.ad
index 27a06092b3..77352f4201 100644
--- a/datasets/GM0743_asten/GM0743_asten.derived.ad
+++ b/datasets/GM0743_asten/GM0743_asten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0743_asten
-- id = 128531
-- parent_id = 128531
+- id = 129219
+- parent_id = 129219
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0743_asten/graph_values.yml b/datasets/GM0743_asten/graph_values.yml
index b134d58370..33b096ecd0 100644
--- a/datasets/GM0743_asten/graph_values.yml
+++ b/datasets/GM0743_asten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1560.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1567062168576253
-    :network_gas: 0.1381158072830608
-    :ambient_heat: 0.705177975859314
+    :electricity: 0.18978264799720335
+    :network_gas: 0.1459768250115997
+    :ambient_heat: 0.6642405269911971
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7040.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 58.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21787703993919272
-    :network_gas: 0.12849184024322685
-    :ambient_heat: 0.6536311198175805
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad
index fc10c05e70..f937df9484 100644
--- a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad
+++ b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0744_baarle_nassau
-- id = 128532
-- parent_id = 128532
+- id = 129220
+- parent_id = 129220
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0744_baarle_nassau/graph_values.yml b/datasets/GM0744_baarle_nassau/graph_values.yml
index 673cf29fb2..af025e868f 100644
--- a/datasets/GM0744_baarle_nassau/graph_values.yml
+++ b/datasets/GM0744_baarle_nassau/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1393.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15355851984714372
-    :network_gas: 0.15542814084070955
-    :ambient_heat: 0.6910133393121468
+    :electricity: 0.18575818906333766
+    :network_gas: 0.16408691691189323
+    :ambient_heat: 0.6501548940247692
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 2911.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 37.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21379987193049405
-    :network_gas: 0.14480051227802157
-    :ambient_heat: 0.6413996157914845
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad
index b484664e0e..e834c1da87 100644
--- a/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad
+++ b/datasets/GM0748_bergen_op_zoom/GM0748_bergen_op_zoom.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0748_bergen_op_zoom
-- id = 128542
-- parent_id = 128542
+- id = 129230
+- parent_id = 129230
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0748_bergen_op_zoom/graph_values.yml b/datasets/GM0748_bergen_op_zoom/graph_values.yml
index 9d6e15c611..b3e763dd2a 100644
--- a/datasets/GM0748_bergen_op_zoom/graph_values.yml
+++ b/datasets/GM0748_bergen_op_zoom/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 10317.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1559401876677186
-    :network_gas: 0.14232896782754753
-    :ambient_heat: 0.7017308445047338
+    :electricity: 0.18880240148039268
+    :network_gas: 0.15038794084011473
+    :ambient_heat: 0.6608096576794927
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 30883.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2761.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21688586417006525
-    :network_gas: 0.13245654331973677
-    :ambient_heat: 0.6506575925101981
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0753_best/GM0753_best.derived.ad b/datasets/GM0753_best/GM0753_best.derived.ad
index 5103d1c836..c268712072 100644
--- a/datasets/GM0753_best/GM0753_best.derived.ad
+++ b/datasets/GM0753_best/GM0753_best.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0753_best
-- id = 128545
-- parent_id = 128545
+- id = 129233
+- parent_id = 129233
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0753_best/graph_values.yml b/datasets/GM0753_best/graph_values.yml
index 4631443dba..1057cbe093 100644
--- a/datasets/GM0753_best/graph_values.yml
+++ b/datasets/GM0753_best/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3948.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1574141107357897
-    :network_gas: 0.13422239095315652
-    :ambient_heat: 0.7083634983110537
+    :electricity: 0.1906889869281303
+    :network_gas: 0.14189829380985752
+    :ambient_heat: 0.6674127192620122
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12967.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 35.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21879239350665744
-    :network_gas: 0.12483042597336776
-    :ambient_heat: 0.6563771805199747
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0755_boekel/GM0755_boekel.derived.ad b/datasets/GM0755_boekel/GM0755_boekel.derived.ad
index 2a4294ecc3..5bdf7fe716 100644
--- a/datasets/GM0755_boekel/GM0755_boekel.derived.ad
+++ b/datasets/GM0755_boekel/GM0755_boekel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0755_boekel
-- id = 128552
-- parent_id = 128552
+- id = 129240
+- parent_id = 129240
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0755_boekel/graph_values.yml b/datasets/GM0755_boekel/graph_values.yml
index d38473e239..8d7591a4f0 100644
--- a/datasets/GM0755_boekel/graph_values.yml
+++ b/datasets/GM0755_boekel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 632.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15793442720583536
-    :network_gas: 0.13136065036790545
-    :ambient_heat: 0.7107049224262592
+    :electricity: 0.1913554618756593
+    :network_gas: 0.1388991521246423
+    :ambient_heat: 0.6697453859996985
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4373.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 11.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21946482985018356
-    :network_gas: 0.12214068059926333
-    :ambient_heat: 0.658394489550553
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad
index c114628922..44eb07ac35 100644
--- a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad
+++ b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0757_boxtel
-- id = 128556
-- parent_id = 128556
+- id = 129244
+- parent_id = 129244
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0757_boxtel/graph_values.yml b/datasets/GM0757_boxtel/graph_values.yml
index 0c31bbf099..a2909e90fd 100644
--- a/datasets/GM0757_boxtel/graph_values.yml
+++ b/datasets/GM0757_boxtel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2429.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15601180337192466
-    :network_gas: 0.14193508145441427
-    :ambient_heat: 0.7020531151736611
+    :electricity: 0.18889402115282355
+    :network_gas: 0.1499756517063789
+    :ambient_heat: 0.6611303271407974
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14342.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 240.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21697855734212426
-    :network_gas: 0.1320857706315005
-    :ambient_heat: 0.6509356720263751
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0758_breda/GM0758_breda.derived.ad b/datasets/GM0758_breda/GM0758_breda.derived.ad
index e5823400f4..69b11edfa7 100644
--- a/datasets/GM0758_breda/GM0758_breda.derived.ad
+++ b/datasets/GM0758_breda/GM0758_breda.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0758_breda
-- id = 128557
-- parent_id = 128557
+- id = 129245
+- parent_id = 129245
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0758_breda/graph_values.yml b/datasets/GM0758_breda/graph_values.yml
index 1a30c638ff..85eedf05cb 100644
--- a/datasets/GM0758_breda/graph_values.yml
+++ b/datasets/GM0758_breda/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 28914.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15811807906504455
-    :network_gas: 0.13035056514225496
-    :ambient_heat: 0.7115313557927005
+    :electricity: 0.19159076227801455
+    :network_gas: 0.137840298753082
+    :ambient_heat: 0.6705689389689035
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 85127.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 6239.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21970209997212906
-    :network_gas: 0.12119160011148135
-    :ambient_heat: 0.6591062999163896
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0762_deurne/GM0762_deurne.derived.ad b/datasets/GM0762_deurne/GM0762_deurne.derived.ad
index fc521ba23f..3c3b29dbca 100644
--- a/datasets/GM0762_deurne/GM0762_deurne.derived.ad
+++ b/datasets/GM0762_deurne/GM0762_deurne.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0762_deurne
-- id = 128578
-- parent_id = 128578
+- id = 129266
+- parent_id = 129266
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0762_deurne/graph_values.yml b/datasets/GM0762_deurne/graph_values.yml
index c685014f24..12b3043ecf 100644
--- a/datasets/GM0762_deurne/graph_values.yml
+++ b/datasets/GM0762_deurne/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3042.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1556206969909659
-    :network_gas: 0.14408616654968764
-    :ambient_heat: 0.7002931364593464
+    :electricity: 0.188393727502391
+    :network_gas: 0.15222697645222846
+    :ambient_heat: 0.6593792960453806
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13959.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 37.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21647227112784234
-    :network_gas: 0.13411091548862833
-    :ambient_heat: 0.6494168133835293
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0765_pekela/GM0765_pekela.derived.ad b/datasets/GM0765_pekela/GM0765_pekela.derived.ad
index bcf124ec4c..01a3be458a 100644
--- a/datasets/GM0765_pekela/GM0765_pekela.derived.ad
+++ b/datasets/GM0765_pekela/GM0765_pekela.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0765_pekela
-- id = 128726
-- parent_id = 128726
+- id = 129414
+- parent_id = 129414
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0765_pekela/graph_values.yml b/datasets/GM0765_pekela/graph_values.yml
index 633896bac6..45c544b00d 100644
--- a/datasets/GM0765_pekela/graph_values.yml
+++ b/datasets/GM0765_pekela/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 921.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1459967152941206
-    :network_gas: 0.19701806588233686
-    :ambient_heat: 0.6569852188235427
+    :electricity: 0.1761275741117888
+    :network_gas: 0.2074247480824946
+    :ambient_heat: 0.6164476778057165
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5751.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 41.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20395830601505904
-    :network_gas: 0.1841667759397616
-    :ambient_heat: 0.6118749180451794
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0766_dongen/GM0766_dongen.derived.ad b/datasets/GM0766_dongen/GM0766_dongen.derived.ad
index b4126a481c..223f6619a7 100644
--- a/datasets/GM0766_dongen/GM0766_dongen.derived.ad
+++ b/datasets/GM0766_dongen/GM0766_dongen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0766_dongen
-- id = 128584
-- parent_id = 128584
+- id = 129272
+- parent_id = 129272
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0766_dongen/graph_values.yml b/datasets/GM0766_dongen/graph_values.yml
index 50c0a29efe..33e1326e00 100644
--- a/datasets/GM0766_dongen/graph_values.yml
+++ b/datasets/GM0766_dongen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1534.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15490223493381564
-    :network_gas: 0.148037707864014
-    :ambient_heat: 0.6970600572021703
+    :electricity: 0.18747505866169187
+    :network_gas: 0.156360992329741
+    :ambient_heat: 0.6561639490085672
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11447.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 152.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21554176459225685
-    :network_gas: 0.13783294163097023
-    :ambient_heat: 0.6466252937767728
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0770_eersel/GM0770_eersel.derived.ad b/datasets/GM0770_eersel/GM0770_eersel.derived.ad
index c95fa9606d..1da5ec62be 100644
--- a/datasets/GM0770_eersel/GM0770_eersel.derived.ad
+++ b/datasets/GM0770_eersel/GM0770_eersel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0770_eersel
-- id = 128595
-- parent_id = 128595
+- id = 129283
+- parent_id = 129283
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0770_eersel/graph_values.yml b/datasets/GM0770_eersel/graph_values.yml
index c38ef27f99..4687b1305c 100644
--- a/datasets/GM0770_eersel/graph_values.yml
+++ b/datasets/GM0770_eersel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1950.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15641565171863447
-    :network_gas: 0.13971391554751036
-    :ambient_heat: 0.7038704327338552
+    :electricity: 0.18941076315203456
+    :network_gas: 0.14765030928190953
+    :ambient_heat: 0.6629389275660558
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8482.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 13.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2175011531813625
-    :network_gas: 0.12999538727454768
-    :ambient_heat: 0.6525034595440898
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad
index 0706c5b9f9..dcbdb63629 100644
--- a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad
+++ b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0772_eindhoven
-- id = 128597
-- parent_id = 128597
+- id = 129285
+- parent_id = 129285
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0772_eindhoven/graph_values.yml b/datasets/GM0772_eindhoven/graph_values.yml
index 1314631482..8a75a36ab5 100644
--- a/datasets/GM0772_eindhoven/graph_values.yml
+++ b/datasets/GM0772_eindhoven/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 40802.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1546632873826724
-    :network_gas: 0.14935191939530165
-    :ambient_heat: 0.6959847932220259
+    :electricity: 0.18716963210244647
+    :network_gas: 0.15773541387251735
+    :ambient_heat: 0.6550949540250361
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 114315.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 8656.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2152321629967191
-    :network_gas: 0.13907134801312135
-    :ambient_heat: 0.6456964889901595
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad
index 58d3427e3c..556ec28a34 100644
--- a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad
+++ b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0777_etten_leur
-- id = 128604
-- parent_id = 128604
+- id = 129292
+- parent_id = 129292
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0777_etten_leur/graph_values.yml b/datasets/GM0777_etten_leur/graph_values.yml
index 1e0905f397..f0321ac8d4 100644
--- a/datasets/GM0777_etten_leur/graph_values.yml
+++ b/datasets/GM0777_etten_leur/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3353.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15825838051580135
-    :network_gas: 0.12957890716309267
-    :ambient_heat: 0.7121627123211061
+    :electricity: 0.19177054196813018
+    :network_gas: 0.13703128895491942
+    :ambient_heat: 0.6711981690769505
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19146.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 56.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2198833371810575
-    :network_gas: 0.12046665127576764
-    :ambient_heat: 0.6596500115431748
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad
index 89ac31b3b5..8dea5e62e9 100644
--- a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad
+++ b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0779_geertruidenberg
-- id = 128605
-- parent_id = 128605
+- id = 129293
+- parent_id = 129293
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0779_geertruidenberg/graph_values.yml b/datasets/GM0779_geertruidenberg/graph_values.yml
index 44a133b3ca..1926c89369 100644
--- a/datasets/GM0779_geertruidenberg/graph_values.yml
+++ b/datasets/GM0779_geertruidenberg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1575.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15708795128991673
-    :network_gas: 0.1360162679054579
-    :ambient_heat: 0.7068957808046253
+    :electricity: 0.19027133676351096
+    :network_gas: 0.14377772232129804
+    :ambient_heat: 0.665950940915191
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9636.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 275.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21837071936329427
-    :network_gas: 0.1265171225468205
-    :ambient_heat: 0.6551121580898852
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad
index 8767073c24..5be6758808 100644
--- a/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad
+++ b/datasets/GM0784_gilze_en_rijen/GM0784_gilze_en_rijen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0784_gilze_en_rijen
-- id = 128609
-- parent_id = 128609
+- id = 129297
+- parent_id = 129297
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0784_gilze_en_rijen/graph_values.yml b/datasets/GM0784_gilze_en_rijen/graph_values.yml
index 6503b42a1c..13d3a7a9e3 100644
--- a/datasets/GM0784_gilze_en_rijen/graph_values.yml
+++ b/datasets/GM0784_gilze_en_rijen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3488.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1567181308541753
-    :network_gas: 0.13805028030203592
-    :ambient_heat: 0.7052315888437889
+    :electricity: 0.18979789800804414
+    :network_gas: 0.14590819986164894
+    :ambient_heat: 0.664293902130307
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11376.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 83.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2178924502916693
-    :network_gas: 0.12843019883332063
-    :ambient_heat: 0.6536773508750101
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0785_goirle/GM0785_goirle.derived.ad b/datasets/GM0785_goirle/GM0785_goirle.derived.ad
index 4afb41c42d..0b1cf153c1 100644
--- a/datasets/GM0785_goirle/GM0785_goirle.derived.ad
+++ b/datasets/GM0785_goirle/GM0785_goirle.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0785_goirle
-- id = 128612
-- parent_id = 128612
+- id = 129300
+- parent_id = 129300
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0785_goirle/graph_values.yml b/datasets/GM0785_goirle/graph_values.yml
index a759f338ac..3c6986ff7b 100644
--- a/datasets/GM0785_goirle/graph_values.yml
+++ b/datasets/GM0785_goirle/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1610.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15752221160622232
-    :network_gas: 0.13362783616577734
-    :ambient_heat: 0.7088499522280004
+    :electricity: 0.19082743292445786
+    :network_gas: 0.14127528590794522
+    :ambient_heat: 0.667897281167597
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10411.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 222.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2189321243766865
-    :network_gas: 0.12427150249325175
-    :ambient_heat: 0.6567963731300619
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0794_helmond/GM0794_helmond.derived.ad b/datasets/GM0794_helmond/GM0794_helmond.derived.ad
index c8f0274808..2dd5bd9565 100644
--- a/datasets/GM0794_helmond/GM0794_helmond.derived.ad
+++ b/datasets/GM0794_helmond/GM0794_helmond.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0794_helmond
-- id = 128635
-- parent_id = 128635
+- id = 129323
+- parent_id = 129323
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0794_helmond/graph_values.yml b/datasets/GM0794_helmond/graph_values.yml
index 7b75804327..895f3cee1c 100644
--- a/datasets/GM0794_helmond/graph_values.yml
+++ b/datasets/GM0794_helmond/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8631.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15909489882025762
-    :network_gas: 0.12497805648858297
-    :ambient_heat: 0.7159270446911593
+    :electricity: 0.19284282171027697
+    :network_gas: 0.13220602300185144
+    :ambient_heat: 0.6749511552878715
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 41212.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1187.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2209634575993525
-    :network_gas: 0.11614616960258764
-    :ambient_heat: 0.6628903727980598
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad
index 2fafe889a1..3ca204f82e 100644
--- a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad
+++ b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0796_s_hertogenbosch
-- id = 128751
-- parent_id = 128751
+- id = 129439
+- parent_id = 129439
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0796_s_hertogenbosch/graph_values.yml b/datasets/GM0796_s_hertogenbosch/graph_values.yml
index 1d509652d2..ad0a40a0a7 100644
--- a/datasets/GM0796_s_hertogenbosch/graph_values.yml
+++ b/datasets/GM0796_s_hertogenbosch/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 29304.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15620816890414269
-    :network_gas: 0.14085507102721517
-    :ambient_heat: 0.7029367600686421
+    :electricity: 0.18914526069179877
+    :network_gas: 0.1488450721142902
+    :ambient_heat: 0.6620096671939111
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 73387.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2551.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21723268560733955
-    :network_gas: 0.13106925757063947
-    :ambient_heat: 0.6516980568220209
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0797_heusden/GM0797_heusden.derived.ad b/datasets/GM0797_heusden/GM0797_heusden.derived.ad
index e382b1ef54..22696c6aff 100644
--- a/datasets/GM0797_heusden/GM0797_heusden.derived.ad
+++ b/datasets/GM0797_heusden/GM0797_heusden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0797_heusden
-- id = 128639
-- parent_id = 128639
+- id = 129327
+- parent_id = 129327
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0797_heusden/graph_values.yml b/datasets/GM0797_heusden/graph_values.yml
index d30d2d8720..11e0aba936 100644
--- a/datasets/GM0797_heusden/graph_values.yml
+++ b/datasets/GM0797_heusden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2826.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15650723560583885
-    :network_gas: 0.13921020416788635
-    :ambient_heat: 0.7042825602262748
+    :electricity: 0.18952796991183804
+    :network_gas: 0.14712287808525468
+    :ambient_heat: 0.6633491520029071
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19327.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 173.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21761964026725214
-    :network_gas: 0.1295214389309892
-    :ambient_heat: 0.6528589208017588
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad
index 2629df1d7f..149b7937c6 100644
--- a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad
+++ b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0798_hilvarenbeek
-- id = 128641
-- parent_id = 128641
+- id = 129329
+- parent_id = 129329
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0798_hilvarenbeek/graph_values.yml b/datasets/GM0798_hilvarenbeek/graph_values.yml
index 64a86a9c21..5de908ee95 100644
--- a/datasets/GM0798_hilvarenbeek/graph_values.yml
+++ b/datasets/GM0798_hilvarenbeek/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1565.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15287579214201358
-    :network_gas: 0.15918314321892524
-    :ambient_heat: 0.6879410646390611
+    :electricity: 0.18488650656599318
+    :network_gas: 0.16800949393260634
+    :ambient_heat: 0.6471039995014004
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6840.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 75.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21291403548535276
-    :network_gas: 0.14834385805858677
-    :ambient_heat: 0.6387421064560606
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad
index eaec008706..c013aaa5de 100644
--- a/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad
+++ b/datasets/GM0809_loon_op_zand/GM0809_loon_op_zand.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0809_loon_op_zand
-- id = 128675
-- parent_id = 128675
+- id = 129363
+- parent_id = 129363
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0809_loon_op_zand/graph_values.yml b/datasets/GM0809_loon_op_zand/graph_values.yml
index 5b1e079c04..25eaa71e59 100644
--- a/datasets/GM0809_loon_op_zand/graph_values.yml
+++ b/datasets/GM0809_loon_op_zand/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2233.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1543604272023535
-    :network_gas: 0.1510176503870558
-    :ambient_heat: 0.6946219224105906
+    :electricity: 0.1867825875194615
+    :network_gas: 0.15947711706356876
+    :ambient_heat: 0.6537402954169698
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10472.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 112.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21483965590413548
-    :network_gas: 0.14064137638345586
-    :ambient_heat: 0.6445189677124087
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad
index 36375847c5..e639a50bdc 100644
--- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad
+++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/GM0820_nuenen_gerwen_en_nederwetten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0820_nuenen_gerwen_en_nederwetten
-- id = 128703
-- parent_id = 128703
+- id = 129391
+- parent_id = 129391
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml
index bcad265069..f3ae3e1aa0 100644
--- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml
+++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1784.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15471597532391673
-    :network_gas: 0.14906213571845792
-    :ambient_heat: 0.6962218889576253
+    :electricity: 0.18723697411400242
+    :network_gas: 0.15743237437377477
+    :ambient_heat: 0.6553306515122227
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10435.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 83.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2153004358155889
-    :network_gas: 0.1387982567376422
-    :ambient_heat: 0.6459013074467689
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad
index 41f20f0c4b..3533871e20 100644
--- a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad
+++ b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0823_oirschot
-- id = 128706
-- parent_id = 128706
+- id = 129394
+- parent_id = 129394
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0823_oirschot/graph_values.yml b/datasets/GM0823_oirschot/graph_values.yml
index 5f93907e02..9840fe7a42 100644
--- a/datasets/GM0823_oirschot/graph_values.yml
+++ b/datasets/GM0823_oirschot/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2143.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15720875626588696
-    :network_gas: 0.1353518405376219
-    :ambient_heat: 0.7074394031964912
+    :electricity: 0.1904260171043947
+    :network_gas: 0.14308165976118573
+    :ambient_heat: 0.6664923231344195
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8010.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 81.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21852691592860715
-    :network_gas: 0.12589233628556917
-    :ambient_heat: 0.6555807477858238
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad
index f6fe63d8ad..570069bb6e 100644
--- a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad
+++ b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0824_oisterwijk
-- id = 128707
-- parent_id = 128707
+- id = 129395
+- parent_id = 129395
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0824_oisterwijk/graph_values.yml b/datasets/GM0824_oisterwijk/graph_values.yml
index 75e9340c93..d19908646b 100644
--- a/datasets/GM0824_oisterwijk/graph_values.yml
+++ b/datasets/GM0824_oisterwijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5683.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1551139886851656
-    :network_gas: 0.14687306223158925
-    :ambient_heat: 0.6980129490832453
+    :electricity: 0.18774576995513761
+    :network_gas: 0.15514278971336068
+    :ambient_heat: 0.6571114403315017
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14096.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 259.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21581607646990958
-    :network_gas: 0.13673569412035938
-    :ambient_heat: 0.647448229409731
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad
index ed7dae1243..b9570889c3 100644
--- a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad
+++ b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0826_oosterhout
-- id = 128714
-- parent_id = 128714
+- id = 129402
+- parent_id = 129402
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0826_oosterhout/graph_values.yml b/datasets/GM0826_oosterhout/graph_values.yml
index 3d2813e30d..5008402e57 100644
--- a/datasets/GM0826_oosterhout/graph_values.yml
+++ b/datasets/GM0826_oosterhout/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6409.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15669443027173033
-    :network_gas: 0.13818063350548326
-    :ambient_heat: 0.7051249362227864
+    :electricity: 0.18976756120288907
+    :network_gas: 0.14604471568609823
+    :ambient_heat: 0.6641877231110127
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 25176.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 400.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21786179422743082
-    :network_gas: 0.12855282309027433
-    :ambient_heat: 0.6535853826822947
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0828_oss/GM0828_oss.derived.ad b/datasets/GM0828_oss/GM0828_oss.derived.ad
index 0ec0063239..76bc0cd009 100644
--- a/datasets/GM0828_oss/GM0828_oss.derived.ad
+++ b/datasets/GM0828_oss/GM0828_oss.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0828_oss
-- id = 128719
-- parent_id = 128719
+- id = 129407
+- parent_id = 129407
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0828_oss/graph_values.yml b/datasets/GM0828_oss/graph_values.yml
index 99f4e08b58..045fb1d828 100644
--- a/datasets/GM0828_oss/graph_values.yml
+++ b/datasets/GM0828_oss/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 7684.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1557873142688455
-    :network_gas: 0.1431697715213497
-    :ambient_heat: 0.7010429142098048
+    :electricity: 0.18860684284884513
+    :network_gas: 0.151267955979397
+    :ambient_heat: 0.660125201171758
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 40708.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 364.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2166879783084532
-    :network_gas: 0.13324808676618494
-    :ambient_heat: 0.6500639349253619
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad
index 93aa488c6c..d685564b7a 100644
--- a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad
+++ b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0840_rucphen
-- id = 128745
-- parent_id = 128745
+- id = 129433
+- parent_id = 129433
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0840_rucphen/graph_values.yml b/datasets/GM0840_rucphen/graph_values.yml
index ed2c73b122..312182563c 100644
--- a/datasets/GM0840_rucphen/graph_values.yml
+++ b/datasets/GM0840_rucphen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1207.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15620494412048694
-    :network_gas: 0.140872807337322
-    :ambient_heat: 0.7029222485421912
+    :electricity: 0.1891411344585748
+    :network_gas: 0.14886364019117104
+    :ambient_heat: 0.6619952253502541
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9868.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 19.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2172285125823145
-    :network_gas: 0.13108594967073978
-    :ambient_heat: 0.6516855377469457
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad
index 5dc11f670f..058822343e 100644
--- a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad
+++ b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0845_sint_michielsgestel
-- id = 128753
-- parent_id = 128753
+- id = 129441
+- parent_id = 129441
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0845_sint_michielsgestel/graph_values.yml b/datasets/GM0845_sint_michielsgestel/graph_values.yml
index 8f1380def9..52fe02e360 100644
--- a/datasets/GM0845_sint_michielsgestel/graph_values.yml
+++ b/datasets/GM0845_sint_michielsgestel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1607.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15604959728214685
-    :network_gas: 0.14172721494819232
-    :ambient_heat: 0.7022231877696608
+    :electricity: 0.18894237372128603
+    :network_gas: 0.14975806482753123
+    :ambient_heat: 0.6612995614511827
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12248.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 88.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21702747212946993
-    :network_gas: 0.13189011148211796
-    :ambient_heat: 0.6510824163884121
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0847_someren/GM0847_someren.derived.ad b/datasets/GM0847_someren/GM0847_someren.derived.ad
index 5ba8a17961..043fcb0814 100644
--- a/datasets/GM0847_someren/GM0847_someren.derived.ad
+++ b/datasets/GM0847_someren/GM0847_someren.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0847_someren
-- id = 128759
-- parent_id = 128759
+- id = 129447
+- parent_id = 129447
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0847_someren/graph_values.yml b/datasets/GM0847_someren/graph_values.yml
index 556ec49df6..b32b07723a 100644
--- a/datasets/GM0847_someren/graph_values.yml
+++ b/datasets/GM0847_someren/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3250.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15598637267993296
-    :network_gas: 0.14207495026036876
-    :ambient_heat: 0.7019386770596984
+    :electricity: 0.18886148651856394
+    :network_gas: 0.15012205777637908
+    :ambient_heat: 0.661016455705057
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8163.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 10.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21694564273059597
-    :network_gas: 0.1322174290776138
-    :ambient_heat: 0.6508369281917902
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad
index 07cf32e0bc..d540fb542f 100644
--- a/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad
+++ b/datasets/GM0848_son_en_breugel/GM0848_son_en_breugel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0848_son_en_breugel
-- id = 128760
-- parent_id = 128760
+- id = 129448
+- parent_id = 129448
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0848_son_en_breugel/graph_values.yml b/datasets/GM0848_son_en_breugel/graph_values.yml
index 77340327a2..822b4eb8ca 100644
--- a/datasets/GM0848_son_en_breugel/graph_values.yml
+++ b/datasets/GM0848_son_en_breugel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2757.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15521348155460613
-    :network_gas: 0.1463258514496662
-    :ambient_heat: 0.6984606669957276
+    :electricity: 0.18787297849952841
+    :network_gas: 0.15457035041971212
+    :ambient_heat: 0.6575566710807595
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7308.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 12.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21594494453474214
-    :network_gas: 0.1362202218610292
-    :ambient_heat: 0.6478348336042287
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad
index 84f5bcaa5f..ac52d48866 100644
--- a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad
+++ b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0851_steenbergen
-- id = 128764
-- parent_id = 128764
+- id = 129452
+- parent_id = 129452
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0851_steenbergen/graph_values.yml b/datasets/GM0851_steenbergen/graph_values.yml
index c12fc07bc2..8663029dec 100644
--- a/datasets/GM0851_steenbergen/graph_values.yml
+++ b/datasets/GM0851_steenbergen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1337.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15661273638030443
-    :network_gas: 0.13862994990832544
-    :ambient_heat: 0.70475731371137
+    :electricity: 0.18966299681903656
+    :network_gas: 0.14651525610710525
+    :ambient_heat: 0.6638217470738582
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10458.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 261.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2177561204296766
-    :network_gas: 0.12897551828129128
-    :ambient_heat: 0.6532683612890322
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0852_waterland/GM0852_waterland.derived.ad b/datasets/GM0852_waterland/GM0852_waterland.derived.ad
index 1b55248330..f216c6f601 100644
--- a/datasets/GM0852_waterland/GM0852_waterland.derived.ad
+++ b/datasets/GM0852_waterland/GM0852_waterland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0852_waterland
-- id = 128807
-- parent_id = 128807
+- id = 129495
+- parent_id = 129495
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0852_waterland/graph_values.yml b/datasets/GM0852_waterland/graph_values.yml
index 715db86079..a22d401d9e 100644
--- a/datasets/GM0852_waterland/graph_values.yml
+++ b/datasets/GM0852_waterland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 965.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15224353031850574
-    :network_gas: 0.16266058324821844
-    :ambient_heat: 0.6850958864332759
+    :electricity: 0.18407964203955207
+    :network_gas: 0.17164038965425796
+    :ambient_heat: 0.6442799683061899
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7391.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 367.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21209319768644314
-    :network_gas: 0.1516272092542254
-    :ambient_heat: 0.6362795930593316
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad
index 56b837b6d1..8791685469 100644
--- a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad
+++ b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0855_tilburg
-- id = 128775
-- parent_id = 128775
+- id = 129463
+- parent_id = 129463
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0855_tilburg/graph_values.yml b/datasets/GM0855_tilburg/graph_values.yml
index 93457b2f8d..b8d8d7cebe 100644
--- a/datasets/GM0855_tilburg/graph_values.yml
+++ b/datasets/GM0855_tilburg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 26666.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1609147728043901
-    :network_gas: 0.1149687495758544
-    :ambient_heat: 0.7241164776197554
+    :electricity: 0.1951778568436938
+    :network_gas: 0.12169834941106322
+    :ambient_heat: 0.683123793745243
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 102395.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 10266.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22331052585411998
-    :network_gas: 0.10675789658351781
-    :ambient_heat: 0.6699315775623623
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad
index 3ebabe3f55..91ec4c35ec 100644
--- a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad
+++ b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0858_valkenswaard
-- id = 128787
-- parent_id = 128787
+- id = 129475
+- parent_id = 129475
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0858_valkenswaard/graph_values.yml b/datasets/GM0858_valkenswaard/graph_values.yml
index 3e67316854..d91eaf44fb 100644
--- a/datasets/GM0858_valkenswaard/graph_values.yml
+++ b/datasets/GM0858_valkenswaard/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2681.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15543178392538862
-    :network_gas: 0.14512518841036243
-    :ambient_heat: 0.6994430276642488
+    :electricity: 0.18815212544560306
+    :network_gas: 0.1533141873105406
+    :ambient_heat: 0.6585336872438564
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14873.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 163.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21622766053863818
-    :network_gas: 0.13508935784544482
-    :ambient_heat: 0.6486829816159169
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad
index 7021b8ba87..5d67e624eb 100644
--- a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad
+++ b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0861_veldhoven
-- id = 128791
-- parent_id = 128791
+- id = 129479
+- parent_id = 129479
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0861_veldhoven/graph_values.yml b/datasets/GM0861_veldhoven/graph_values.yml
index d964d7a1c2..f3485a247d 100644
--- a/datasets/GM0861_veldhoven/graph_values.yml
+++ b/datasets/GM0861_veldhoven/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4424.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.156107488461369
-    :network_gas: 0.14140881346247064
-    :ambient_heat: 0.7024836980761605
+    :electricity: 0.18901644079848212
+    :network_gas: 0.14942476248879463
+    :ambient_heat: 0.6615587967127233
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20078.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 49.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2171023946286328
-    :network_gas: 0.13159042148546649
-    :ambient_heat: 0.6513071838859008
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0865_vught/GM0865_vught.derived.ad b/datasets/GM0865_vught/GM0865_vught.derived.ad
index f638a93121..cb358b0cdb 100644
--- a/datasets/GM0865_vught/GM0865_vught.derived.ad
+++ b/datasets/GM0865_vught/GM0865_vught.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0865_vught
-- id = 128801
-- parent_id = 128801
+- id = 129489
+- parent_id = 129489
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0865_vught/graph_values.yml b/datasets/GM0865_vught/graph_values.yml
index f6475be058..0d2d401abc 100644
--- a/datasets/GM0865_vught/graph_values.yml
+++ b/datasets/GM0865_vught/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3782.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15398192138855205
-    :network_gas: 0.15309943236296372
-    :ambient_heat: 0.6929186462484842
+    :electricity: 0.18629899008536058
+    :network_gas: 0.16165330872516465
+    :ambient_heat: 0.6520477011894747
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13714.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 537.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21434896319373303
-    :network_gas: 0.14260414722506562
-    :ambient_heat: 0.6430468895812014
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0866_waalre/GM0866_waalre.derived.ad b/datasets/GM0866_waalre/GM0866_waalre.derived.ad
index 2c96809af9..8cc85f362b 100644
--- a/datasets/GM0866_waalre/GM0866_waalre.derived.ad
+++ b/datasets/GM0866_waalre/GM0866_waalre.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0866_waalre
-- id = 128802
-- parent_id = 128802
+- id = 129490
+- parent_id = 129490
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0866_waalre/graph_values.yml b/datasets/GM0866_waalre/graph_values.yml
index 5469bccdee..e1b8f4d427 100644
--- a/datasets/GM0866_waalre/graph_values.yml
+++ b/datasets/GM0866_waalre/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1767.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1540074069843353
-    :network_gas: 0.1529592615861559
-    :ambient_heat: 0.6930333314295088
+    :electricity: 0.1863315475509772
+    :network_gas: 0.1615067999139067
+    :ambient_heat: 0.6521616525351162
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7789.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 145.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21438200776269503
-    :network_gas: 0.14247196894921757
-    :ambient_heat: 0.6431460232880873
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad
index d88b5fbf63..73e513021a 100644
--- a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad
+++ b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0867_waalwijk
-- id = 128803
-- parent_id = 128803
+- id = 129491
+- parent_id = 129491
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0867_waalwijk/graph_values.yml b/datasets/GM0867_waalwijk/graph_values.yml
index e16c13cbbf..53f8f8a0f3 100644
--- a/datasets/GM0867_waalwijk/graph_values.yml
+++ b/datasets/GM0867_waalwijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5142.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15530368786655105
-    :network_gas: 0.14582971673396924
-    :ambient_heat: 0.6988665953994798
+    :electricity: 0.1879883214775672
+    :network_gas: 0.1540513062533627
+    :ambient_heat: 0.6579603722690701
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 21972.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 371.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2160617743312283
-    :network_gas: 0.1357529026750845
-    :ambient_heat: 0.6481853229936871
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad
index 808e38fec9..7def67b406 100644
--- a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad
+++ b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0873_woensdrecht
-- id = 128819
-- parent_id = 128819
+- id = 129507
+- parent_id = 129507
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0873_woensdrecht/graph_values.yml b/datasets/GM0873_woensdrecht/graph_values.yml
index 5a599739eb..2f5bae1ef5 100644
--- a/datasets/GM0873_woensdrecht/graph_values.yml
+++ b/datasets/GM0873_woensdrecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3236.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1556487612100915
-    :network_gas: 0.14393181334449676
-    :ambient_heat: 0.7004194254454117
+    :electricity: 0.18842962182857867
+    :network_gas: 0.15206545174626437
+    :ambient_heat: 0.659504926425157
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9912.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 62.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21650860605536387
-    :network_gas: 0.13396557577854215
-    :ambient_heat: 0.649525818166094
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0879_zundert/GM0879_zundert.derived.ad b/datasets/GM0879_zundert/GM0879_zundert.derived.ad
index f1cefad99a..6a2e878de6 100644
--- a/datasets/GM0879_zundert/GM0879_zundert.derived.ad
+++ b/datasets/GM0879_zundert/GM0879_zundert.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0879_zundert
-- id = 128832
-- parent_id = 128832
+- id = 129520
+- parent_id = 129520
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0879_zundert/graph_values.yml b/datasets/GM0879_zundert/graph_values.yml
index 8b8edb618f..888e8bf010 100644
--- a/datasets/GM0879_zundert/graph_values.yml
+++ b/datasets/GM0879_zundert/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1394.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.154611434684592
-    :network_gas: 0.14963710923474402
-    :ambient_heat: 0.695751456080664
+    :electricity: 0.18710336015430282
+    :network_gas: 0.15803363807880605
+    :ambient_heat: 0.6548630017668912
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9626.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 70.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2151649693562863
-    :network_gas: 0.13934012257485262
-    :ambient_heat: 0.6454949080688611
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad
index fe83eefcdd..5cd8a6bd2f 100644
--- a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad
+++ b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0880_wormerland
-- id = 128821
-- parent_id = 128821
+- id = 129509
+- parent_id = 129509
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0880_wormerland/graph_values.yml b/datasets/GM0880_wormerland/graph_values.yml
index f18bfe7fe7..f16fee0c86 100644
--- a/datasets/GM0880_wormerland/graph_values.yml
+++ b/datasets/GM0880_wormerland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 976.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15445035492557524
-    :network_gas: 0.15052304790933616
-    :ambient_heat: 0.6950265971650886
+    :electricity: 0.1868975030837415
+    :network_gas: 0.1589599962619692
+    :ambient_heat: 0.6541425006542892
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6911.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 130.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21495621336808124
-    :network_gas: 0.14017514652767282
-    :ambient_heat: 0.644868640104246
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad
index 6d2023d789..d4f439e04c 100644
--- a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad
+++ b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0882_landgraaf
-- id = 128661
-- parent_id = 128661
+- id = 129349
+- parent_id = 129349
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0882_landgraaf/graph_values.yml b/datasets/GM0882_landgraaf/graph_values.yml
index fc636dedb8..e31561f776 100644
--- a/datasets/GM0882_landgraaf/graph_values.yml
+++ b/datasets/GM0882_landgraaf/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3100.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1543973049183598
-    :network_gas: 0.15081482294902132
-    :ambient_heat: 0.6947878721326189
+    :electricity: 0.1868297113852374
+    :network_gas: 0.15926505935496174
+    :ambient_heat: 0.6539052292598009
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18136.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 892.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2148874551188652
-    :network_gas: 0.14045017952453695
-    :ambient_heat: 0.6446623653565979
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0888_beek/GM0888_beek.derived.ad b/datasets/GM0888_beek/GM0888_beek.derived.ad
index 00f86d8cd4..f21867f4e5 100644
--- a/datasets/GM0888_beek/GM0888_beek.derived.ad
+++ b/datasets/GM0888_beek/GM0888_beek.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0888_beek
-- id = 128536
-- parent_id = 128536
+- id = 129224
+- parent_id = 129224
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0888_beek/graph_values.yml b/datasets/GM0888_beek/graph_values.yml
index b4d8ffeb53..ab2df3eea8 100644
--- a/datasets/GM0888_beek/graph_values.yml
+++ b/datasets/GM0888_beek/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2372.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15480304121828212
-    :network_gas: 0.14858327329944837
-    :ambient_heat: 0.6966136854822695
+    :electricity: 0.18734826124593634
+    :network_gas: 0.15693158154180348
+    :ambient_heat: 0.6557201572122602
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7484.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 281.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21541324842874743
-    :network_gas: 0.13834700628500804
-    :ambient_heat: 0.6462397452862446
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0889_beesel/GM0889_beesel.derived.ad b/datasets/GM0889_beesel/GM0889_beesel.derived.ad
index d300a7a4ed..8814a42f0b 100644
--- a/datasets/GM0889_beesel/GM0889_beesel.derived.ad
+++ b/datasets/GM0889_beesel/GM0889_beesel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0889_beesel
-- id = 128537
-- parent_id = 128537
+- id = 129225
+- parent_id = 129225
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0889_beesel/graph_values.yml b/datasets/GM0889_beesel/graph_values.yml
index 30b64d585c..6c47e44e88 100644
--- a/datasets/GM0889_beesel/graph_values.yml
+++ b/datasets/GM0889_beesel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1025.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15619798410609195
-    :network_gas: 0.14091108741649416
-    :ambient_heat: 0.7028909284774137
+    :electricity: 0.18913222888862463
+    :network_gas: 0.14890371531502544
+    :ambient_heat: 0.6619640557963498
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6031.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 51.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21721950594841005
-    :network_gas: 0.13112197620635763
-    :ambient_heat: 0.6516585178452324
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0893_bergen/GM0893_bergen.derived.ad b/datasets/GM0893_bergen/GM0893_bergen.derived.ad
index 695ede6aa3..ae9b4422d9 100644
--- a/datasets/GM0893_bergen/GM0893_bergen.derived.ad
+++ b/datasets/GM0893_bergen/GM0893_bergen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0893_bergen
-- id = 128540
-- parent_id = 128540
+- id = 129228
+- parent_id = 129228
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0893_bergen/graph_values.yml b/datasets/GM0893_bergen/graph_values.yml
index 22aa04b5bb..edcf7ec9bb 100644
--- a/datasets/GM0893_bergen/graph_values.yml
+++ b/datasets/GM0893_bergen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 715.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1562221429177464
-    :network_gas: 0.14077821395239498
-    :ambient_heat: 0.7029996431298586
+    :electricity: 0.189163141084866
+    :network_gas: 0.14876461022687076
+    :ambient_heat: 0.6620722486882633
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5772.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 24.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21725076851417566
-    :network_gas: 0.1309969259432952
-    :ambient_heat: 0.6517523055425293
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad
index 664441b39d..7b102fdc56 100644
--- a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad
+++ b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0899_brunssum
-- id = 128560
-- parent_id = 128560
+- id = 129248
+- parent_id = 129248
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0899_brunssum/graph_values.yml b/datasets/GM0899_brunssum/graph_values.yml
index bdf313042d..0ca37a403f 100644
--- a/datasets/GM0899_brunssum/graph_values.yml
+++ b/datasets/GM0899_brunssum/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3086.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1553970235883845
-    :network_gas: 0.14531637026388539
-    :ambient_heat: 0.6992866061477302
+    :electricity: 0.18810767385112878
+    :network_gas: 0.15351421978056268
+    :ambient_heat: 0.6583781063683085
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14436.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1202.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21618264728004435
-    :network_gas: 0.13526941087982025
-    :ambient_heat: 0.6485479418401354
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0907_gennep/GM0907_gennep.derived.ad b/datasets/GM0907_gennep/GM0907_gennep.derived.ad
index d2bfdcaf74..38bed9e8ac 100644
--- a/datasets/GM0907_gennep/GM0907_gennep.derived.ad
+++ b/datasets/GM0907_gennep/GM0907_gennep.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0907_gennep
-- id = 128608
-- parent_id = 128608
+- id = 129296
+- parent_id = 129296
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0907_gennep/graph_values.yml b/datasets/GM0907_gennep/graph_values.yml
index 822c100f82..cc3be8bc1f 100644
--- a/datasets/GM0907_gennep/graph_values.yml
+++ b/datasets/GM0907_gennep/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1945.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15507112237921286
-    :network_gas: 0.1471088269143294
-    :ambient_heat: 0.6978200507064579
+    :electricity: 0.1876909652376238
+    :network_gas: 0.15538941130574252
+    :ambient_heat: 0.6569196234566337
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7484.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 139.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21576055040195535
-    :network_gas: 0.1369577983921763
-    :ambient_heat: 0.6472816512058684
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad
index 7b80a7324c..a8f05681be 100644
--- a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad
+++ b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0917_heerlen
-- id = 128631
-- parent_id = 128631
+- id = 129319
+- parent_id = 129319
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0917_heerlen/graph_values.yml b/datasets/GM0917_heerlen/graph_values.yml
index 0fd2046ba3..078e7a4cb2 100644
--- a/datasets/GM0917_heerlen/graph_values.yml
+++ b/datasets/GM0917_heerlen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 16292.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15381852804268134
-    :network_gas: 0.1539980957652526
-    :ambient_heat: 0.692183376192066
+    :electricity: 0.1860902718458124
+    :network_gas: 0.16259254218774938
+    :ambient_heat: 0.6513171859664382
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 45956.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 3851.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21413708991526714
-    :network_gas: 0.14345164033892902
-    :ambient_heat: 0.6424112697458038
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad
index 241114b5c1..b3f8b77f74 100644
--- a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad
+++ b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0928_kerkrade
-- id = 128656
-- parent_id = 128656
+- id = 129344
+- parent_id = 129344
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0928_kerkrade/graph_values.yml b/datasets/GM0928_kerkrade/graph_values.yml
index 61c3b17d16..a184afae09 100644
--- a/datasets/GM0928_kerkrade/graph_values.yml
+++ b/datasets/GM0928_kerkrade/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5001.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15291275209156394
-    :network_gas: 0.15897986349639837
-    :ambient_heat: 0.6881073844120377
+    :electricity: 0.18493368466478105
+    :network_gas: 0.16779719217508574
+    :ambient_heat: 0.6472691231601332
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 23908.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2171.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21296200466430193
-    :network_gas: 0.14815198134279003
-    :ambient_heat: 0.6388860139929081
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad
index dba5806415..1fa468c6f2 100644
--- a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad
+++ b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0935_maastricht
-- id = 128681
-- parent_id = 128681
+- id = 129369
+- parent_id = 129369
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0935_maastricht/graph_values.yml b/datasets/GM0935_maastricht/graph_values.yml
index e64da4b18c..630a6d1b37 100644
--- a/datasets/GM0935_maastricht/graph_values.yml
+++ b/datasets/GM0935_maastricht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 23072.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15196369144779315
-    :network_gas: 0.16419969703713774
-    :ambient_heat: 0.6838366115150691
+    :electricity: 0.18372264217288928
+    :network_gas: 0.17324689142254548
+    :ambient_heat: 0.6430304664045653
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 62599.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 5445.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2117297474958715
-    :network_gas: 0.15308101001651156
-    :ambient_heat: 0.6351892424876168
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad
index f5dc6bfc68..d31a9b747f 100644
--- a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad
+++ b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0938_meerssen
-- id = 128683
-- parent_id = 128683
+- id = 129371
+- parent_id = 129371
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0938_meerssen/graph_values.yml b/datasets/GM0938_meerssen/graph_values.yml
index 0ef2a568b4..d1f113559d 100644
--- a/datasets/GM0938_meerssen/graph_values.yml
+++ b/datasets/GM0938_meerssen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1146.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15448443009671345
-    :network_gas: 0.150335634468076
-    :ambient_heat: 0.6951799354352105
+    :electricity: 0.18694104853998011
+    :network_gas: 0.1587640414200188
+    :ambient_heat: 0.6542949100400011
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8632.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 385.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21500037657134494
-    :network_gas: 0.139998493714618
-    :ambient_heat: 0.645001129714037
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad
index a5a667b202..fd2a3b520b 100644
--- a/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad
+++ b/datasets/GM0944_mook_en_middelaar/GM0944_mook_en_middelaar.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0944_mook_en_middelaar
-- id = 128691
-- parent_id = 128691
+- id = 129379
+- parent_id = 129379
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0944_mook_en_middelaar/graph_values.yml b/datasets/GM0944_mook_en_middelaar/graph_values.yml
index 80dac8e5e8..455659baeb 100644
--- a/datasets/GM0944_mook_en_middelaar/graph_values.yml
+++ b/datasets/GM0944_mook_en_middelaar/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 633.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15449765315927796
-    :network_gas: 0.15026290762397101
-    :ambient_heat: 0.6952394392167509
+    :electricity: 0.18695794689020812
+    :network_gas: 0.1586879987318908
+    :ambient_heat: 0.6543540543779011
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 3661.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 8.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21501751399095062
-    :network_gas: 0.13992994403619513
-    :ambient_heat: 0.6450525419728542
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad
index c8632c11b6..b34498470e 100644
--- a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad
+++ b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0946_nederweert
-- id = 128693
-- parent_id = 128693
+- id = 129381
+- parent_id = 129381
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0946_nederweert/graph_values.yml b/datasets/GM0946_nederweert/graph_values.yml
index 719c2c3b03..7b0c4b717e 100644
--- a/datasets/GM0946_nederweert/graph_values.yml
+++ b/datasets/GM0946_nederweert/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1204.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15745428313452262
-    :network_gas: 0.1340014427601256
-    :ambient_heat: 0.7085442741053518
+    :electricity: 0.19074043489973774
+    :network_gas: 0.1416667775963228
+    :ambient_heat: 0.6675927875039395
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7513.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 31.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21884432180008143
-    :network_gas: 0.12462271279967185
-    :ambient_heat: 0.6565329654002466
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0957_roermond/GM0957_roermond.derived.ad b/datasets/GM0957_roermond/GM0957_roermond.derived.ad
index fd13b63401..a9b0e6f65a 100644
--- a/datasets/GM0957_roermond/GM0957_roermond.derived.ad
+++ b/datasets/GM0957_roermond/GM0957_roermond.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0957_roermond
-- id = 128741
-- parent_id = 128741
+- id = 129429
+- parent_id = 129429
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0957_roermond/graph_values.yml b/datasets/GM0957_roermond/graph_values.yml
index 8c73f0f408..002f16a437 100644
--- a/datasets/GM0957_roermond/graph_values.yml
+++ b/datasets/GM0957_roermond/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 12116.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15506946192944748
-    :network_gas: 0.14711795938803882
-    :ambient_heat: 0.6978125786825137
+    :electricity: 0.18768884238127995
+    :network_gas: 0.15539896417337265
+    :ambient_heat: 0.6569121934453475
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 27685.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1646.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21575839952678127
-    :network_gas: 0.1369664018928726
-    :ambient_heat: 0.6472751985803462
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad
index df7095e68e..3cbbcf3be9 100644
--- a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad
+++ b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0965_simpelveld
-- id = 128752
-- parent_id = 128752
+- id = 129440
+- parent_id = 129440
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0965_simpelveld/graph_values.yml b/datasets/GM0965_simpelveld/graph_values.yml
index dfdaefcc28..90ea31ad4f 100644
--- a/datasets/GM0965_simpelveld/graph_values.yml
+++ b/datasets/GM0965_simpelveld/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 790.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15227571599006046
-    :network_gas: 0.16248356205466746
-    :ambient_heat: 0.6852407219552721
+    :electricity: 0.184120707029933
+    :network_gas: 0.17145559692512236
+    :ambient_heat: 0.6444236960449446
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5176.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 348.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21213499410385436
-    :network_gas: 0.1514600235845803
-    :ambient_heat: 0.6364049823115653
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0971_stein/GM0971_stein.derived.ad b/datasets/GM0971_stein/GM0971_stein.derived.ad
index 2fd2a793bf..dee2eaf22a 100644
--- a/datasets/GM0971_stein/GM0971_stein.derived.ad
+++ b/datasets/GM0971_stein/GM0971_stein.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0971_stein
-- id = 128766
-- parent_id = 128766
+- id = 129454
+- parent_id = 129454
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0971_stein/graph_values.yml b/datasets/GM0971_stein/graph_values.yml
index fddc0802f2..276da8a99e 100644
--- a/datasets/GM0971_stein/graph_values.yml
+++ b/datasets/GM0971_stein/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1843.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15683950288721582
-    :network_gas: 0.13738273412031302
-    :ambient_heat: 0.7057777629924711
+    :electricity: 0.18995326270193288
+    :network_gas: 0.14520905770847403
+    :ambient_heat: 0.6648376795895931
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11803.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 251.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21804943161674245
-    :network_gas: 0.12780227353302778
-    :ambient_heat: 0.6541482948502297
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0981_vaals/GM0981_vaals.derived.ad b/datasets/GM0981_vaals/GM0981_vaals.derived.ad
index bd2d6db693..898d84e143 100644
--- a/datasets/GM0981_vaals/GM0981_vaals.derived.ad
+++ b/datasets/GM0981_vaals/GM0981_vaals.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0981_vaals
-- id = 128785
-- parent_id = 128785
+- id = 129473
+- parent_id = 129473
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0981_vaals/graph_values.yml b/datasets/GM0981_vaals/graph_values.yml
index b87249919f..b11c2a881b 100644
--- a/datasets/GM0981_vaals/graph_values.yml
+++ b/datasets/GM0981_vaals/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1128.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14851620555352824
-    :network_gas: 0.18316086945559476
-    :ambient_heat: 0.6683229249908771
+    :electricity: 0.17933050471885326
+    :network_gas: 0.19301153910275162
+    :ambient_heat: 0.6276579561783951
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5816.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 184.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20724476058048774
-    :network_gas: 0.17102095767804681
-    :ambient_heat: 0.6217342817414654
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0983_venlo/GM0983_venlo.derived.ad b/datasets/GM0983_venlo/GM0983_venlo.derived.ad
index bb7539ef5f..9f2086befa 100644
--- a/datasets/GM0983_venlo/GM0983_venlo.derived.ad
+++ b/datasets/GM0983_venlo/GM0983_venlo.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0983_venlo
-- id = 128793
-- parent_id = 128793
+- id = 129481
+- parent_id = 129481
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0983_venlo/graph_values.yml b/datasets/GM0983_venlo/graph_values.yml
index b25931ddba..8cbc056c45 100644
--- a/datasets/GM0983_venlo/graph_values.yml
+++ b/datasets/GM0983_venlo/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 12644.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15474805124120253
-    :network_gas: 0.14888571817338606
-    :ambient_heat: 0.6963662305854114
+    :electricity: 0.1872779725511167
+    :network_gas: 0.15724788113478058
+    :ambient_heat: 0.6554741463141026
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 47741.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2292.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21534199809013835
-    :network_gas: 0.13863200763944422
-    :ambient_heat: 0.6460259942704174
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0984_venray/GM0984_venray.derived.ad b/datasets/GM0984_venray/GM0984_venray.derived.ad
index 39e1ad593a..27158e05ce 100644
--- a/datasets/GM0984_venray/GM0984_venray.derived.ad
+++ b/datasets/GM0984_venray/GM0984_venray.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0984_venray
-- id = 128794
-- parent_id = 128794
+- id = 129482
+- parent_id = 129482
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0984_venray/graph_values.yml b/datasets/GM0984_venray/graph_values.yml
index a12ed9ae63..cdec114b3e 100644
--- a/datasets/GM0984_venray/graph_values.yml
+++ b/datasets/GM0984_venray/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4681.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15608692954506723
-    :network_gas: 0.1415218875021303
-    :ambient_heat: 0.7023911829528026
+    :electricity: 0.18899013697286135
+    :network_gas: 0.1495431298785852
+    :ambient_heat: 0.6614667331485534
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19163.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 107.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21707578781506268
-    :network_gas: 0.13169684873974707
-    :ambient_heat: 0.6512273634451904
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad
index 02bd35eed8..3681377669 100644
--- a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad
+++ b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0986_voerendaal
-- id = 128798
-- parent_id = 128798
+- id = 129486
+- parent_id = 129486
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0986_voerendaal/graph_values.yml b/datasets/GM0986_voerendaal/graph_values.yml
index 0371343249..cc599a24b8 100644
--- a/datasets/GM0986_voerendaal/graph_values.yml
+++ b/datasets/GM0986_voerendaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 649.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15414849846295456
-    :network_gas: 0.15218325845374997
-    :ambient_heat: 0.6936682430832954
+    :electricity: 0.1865118006893575
+    :network_gas: 0.16069565959541207
+    :ambient_heat: 0.6527925397152303
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5803.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 200.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21456493310635258
-    :network_gas: 0.14174026757458733
-    :ambient_heat: 0.64369479931906
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0988_weert/GM0988_weert.derived.ad b/datasets/GM0988_weert/GM0988_weert.derived.ad
index 3058a416bb..6204da53ac 100644
--- a/datasets/GM0988_weert/GM0988_weert.derived.ad
+++ b/datasets/GM0988_weert/GM0988_weert.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0988_weert
-- id = 128808
-- parent_id = 128808
+- id = 129496
+- parent_id = 129496
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0988_weert/graph_values.yml b/datasets/GM0988_weert/graph_values.yml
index 21a4a167e2..f336783bda 100644
--- a/datasets/GM0988_weert/graph_values.yml
+++ b/datasets/GM0988_weert/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 9149.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15533519399489878
-    :network_gas: 0.1456564330280566
-    :ambient_heat: 0.6990083729770445
+    :electricity: 0.18802860880511604
+    :network_gas: 0.15387001301213027
+    :ambient_heat: 0.6581013781827536
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6030.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 12.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2161025769663592
-    :network_gas: 0.13558969213456099
-    :ambient_heat: 0.6483077308990799
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad
index 2ef5a1ad5b..70d196400a 100644
--- a/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad
+++ b/datasets/GM0994_valkenburg_aan_de_geul/GM0994_valkenburg_aan_de_geul.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0994_valkenburg_aan_de_geul
-- id = 128786
-- parent_id = 128786
+- id = 129474
+- parent_id = 129474
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml
index fe56cafefb..28a4f699ba 100644
--- a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml
+++ b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3012.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1516879317752206
-    :network_gas: 0.1657163752362866
-    :ambient_heat: 0.6825956929884928
+    :electricity: 0.18337091713807246
+    :network_gas: 0.17482965641253326
+    :ambient_heat: 0.6417994264493944
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8304.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 374.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2113715066222081
-    :network_gas: 0.15451397351116522
-    :ambient_heat: 0.6341145198666266
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad
index 42290a7790..c3a5a9665f 100644
--- a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad
+++ b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad
@@ -1,6 +1,6 @@
 - area = GM0995_lelystad
-- id = 128669
-- parent_id = 128669
+- id = 129357
+- parent_id = 129357
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM0995_lelystad/graph_values.yml b/datasets/GM0995_lelystad/graph_values.yml
index 2031eedc1b..c5efe3f737 100644
--- a/datasets/GM0995_lelystad/graph_values.yml
+++ b/datasets/GM0995_lelystad/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6714.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15844166882475516
-    :network_gas: 0.1285708214638466
-    :ambient_heat: 0.7129875097113982
+    :electricity: 0.19200543184559873
+    :network_gas: 0.13597428294807257
+    :ambient_heat: 0.6720202852063287
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 33718.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 0.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22012006948383755
-    :network_gas: 0.11951972206464748
-    :ambient_heat: 0.660360208451515
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad
index da1088c997..3ff6fcf45f 100644
--- a/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad
+++ b/datasets/GM1507_horst_aan_de_maas/GM1507_horst_aan_de_maas.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1507_horst_aan_de_maas
-- id = 128647
-- parent_id = 128647
+- id = 129335
+- parent_id = 129335
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1507_horst_aan_de_maas/graph_values.yml b/datasets/GM1507_horst_aan_de_maas/graph_values.yml
index 6221f0a94a..0343880ddc 100644
--- a/datasets/GM1507_horst_aan_de_maas/graph_values.yml
+++ b/datasets/GM1507_horst_aan_de_maas/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4991.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15569661596941034
-    :network_gas: 0.14366861216824303
-    :ambient_heat: 0.7006347718623466
+    :electricity: 0.18849083007669698
+    :network_gas: 0.15179001422368188
+    :ambient_heat: 0.6597191556996211
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 17884.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 118.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21657056183183254
-    :network_gas: 0.13371775267266756
-    :ambient_heat: 0.6497116854954998
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad
index c0f6633fa6..5a9d7c8550 100644
--- a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad
+++ b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1509_oude_ijsselstreek
-- id = 128720
-- parent_id = 128720
+- id = 129408
+- parent_id = 129408
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1509_oude_ijsselstreek/graph_values.yml b/datasets/GM1509_oude_ijsselstreek/graph_values.yml
index bdefcdc9aa..a4711b8a98 100644
--- a/datasets/GM1509_oude_ijsselstreek/graph_values.yml
+++ b/datasets/GM1509_oude_ijsselstreek/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2833.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15563358278258402
-    :network_gas: 0.1440152946957879
-    :ambient_heat: 0.700351122521628
+    :electricity: 0.1884102084262539
+    :network_gas: 0.1521528121855125
+    :ambient_heat: 0.6594369793882335
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 17403.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 162.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21648895455893705
-    :network_gas: 0.13404418176424968
-    :ambient_heat: 0.6494668636768134
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad
index 6d161d7e68..0d62a71c86 100644
--- a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad
+++ b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1525_teylingen
-- id = 128772
-- parent_id = 128772
+- id = 129460
+- parent_id = 129460
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1525_teylingen/graph_values.yml b/datasets/GM1525_teylingen/graph_values.yml
index 4a66b29d2b..220d7907c3 100644
--- a/datasets/GM1525_teylingen/graph_values.yml
+++ b/datasets/GM1525_teylingen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4502.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15643151601992264
-    :network_gas: 0.13962666189042547
-    :ambient_heat: 0.7039418220896518
+    :electricity: 0.18943106532827858
+    :network_gas: 0.1475589493541288
+    :ambient_heat: 0.6630099853175927
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16273.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 577.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21752167838708272
-    :network_gas: 0.12991328645166678
-    :ambient_heat: 0.6525650351612505
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad
index e5e8602a4e..a187385de7 100644
--- a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad
+++ b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1581_utrechtse_heuvelrug
-- id = 128784
-- parent_id = 128784
+- id = 129472
+- parent_id = 129472
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml
index 9b2576b928..d71a37935d 100644
--- a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml
+++ b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5764.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15234772074478517
-    :network_gas: 0.16208753590368163
-    :ambient_heat: 0.6855647433515332
+    :electricity: 0.1842125797837161
+    :network_gas: 0.17104216892362265
+    :ambient_heat: 0.6447452512926612
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 21833.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 148.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.212228495371317
-    :network_gas: 0.1510860185147297
-    :ambient_heat: 0.6366854861139533
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad
index 4436c47773..9ec309f82f 100644
--- a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad
+++ b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1586_oost_gelre
-- id = 128713
-- parent_id = 128713
+- id = 129401
+- parent_id = 129401
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1586_oost_gelre/graph_values.yml b/datasets/GM1586_oost_gelre/graph_values.yml
index 69c065cdea..1400a74828 100644
--- a/datasets/GM1586_oost_gelre/graph_values.yml
+++ b/datasets/GM1586_oost_gelre/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2984.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15555047131973723
-    :network_gas: 0.14447240774144526
-    :ambient_heat: 0.6999771209388176
+    :electricity: 0.18830391159875534
+    :network_gas: 0.15263114861441957
+    :ambient_heat: 0.659064939786825
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12912.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 161.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21638134551753513
-    :network_gas: 0.13447461792985724
-    :ambient_heat: 0.6491440365526078
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad
index d7f58403cf..93e8415f5b 100644
--- a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad
+++ b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1598_koggenland
-- id = 128657
-- parent_id = 128657
+- id = 129345
+- parent_id = 129345
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1598_koggenland/graph_values.yml b/datasets/GM1598_koggenland/graph_values.yml
index 5280ab3de8..d865d8ad3c 100644
--- a/datasets/GM1598_koggenland/graph_values.yml
+++ b/datasets/GM1598_koggenland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1085.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15621579378166658
-    :network_gas: 0.14081313420083374
-    :ambient_heat: 0.7029710720174998
+    :electricity: 0.1891550170507623
+    :network_gas: 0.14880116843423138
+    :ambient_heat: 0.6620438145150063
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9603.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 17.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21724255251767446
-    :network_gas: 0.13102978992929978
-    :ambient_heat: 0.6517276575530258
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad
index 8c4f05bd08..cd4d0a2eb9 100644
--- a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad
+++ b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1621_lansingerland
-- id = 128663
-- parent_id = 128663
+- id = 129351
+- parent_id = 129351
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1621_lansingerland/graph_values.yml b/datasets/GM1621_lansingerland/graph_values.yml
index e13ffccec8..69b10ec754 100644
--- a/datasets/GM1621_lansingerland/graph_values.yml
+++ b/datasets/GM1621_lansingerland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3854.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15953647917745456
-    :network_gas: 0.12254936452399982
-    :ambient_heat: 0.7179141562985456
+    :electricity: 0.19340911858278137
+    :network_gas: 0.1296576833188196
+    :ambient_heat: 0.6769331980983992
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 24648.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 287.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22153330674064456
-    :network_gas: 0.1138667730374195
-    :ambient_heat: 0.664599920221936
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1640_leudal/GM1640_leudal.derived.ad b/datasets/GM1640_leudal/GM1640_leudal.derived.ad
index e3bb5dae90..0efd62f17d 100644
--- a/datasets/GM1640_leudal/GM1640_leudal.derived.ad
+++ b/datasets/GM1640_leudal/GM1640_leudal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1640_leudal
-- id = 128670
-- parent_id = 128670
+- id = 129358
+- parent_id = 129358
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1640_leudal/graph_values.yml b/datasets/GM1640_leudal/graph_values.yml
index 13d3db6166..a964c1d834 100644
--- a/datasets/GM1640_leudal/graph_values.yml
+++ b/datasets/GM1640_leudal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2657.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15645104837920193
-    :network_gas: 0.13951923391438925
-    :ambient_heat: 0.7040297177064088
+    :electricity: 0.18945606198529982
+    :network_gas: 0.14744646423170757
+    :ambient_heat: 0.6630974737829926
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16118.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 124.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2175469489221297
-    :network_gas: 0.1298122043114789
-    :ambient_heat: 0.6526408467663913
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad
index 2c5396d129..3e11b75bdb 100644
--- a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad
+++ b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1641_maasgouw
-- id = 128679
-- parent_id = 128679
+- id = 129367
+- parent_id = 129367
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1641_maasgouw/graph_values.yml b/datasets/GM1641_maasgouw/graph_values.yml
index dba75d3210..2d7187f947 100644
--- a/datasets/GM1641_maasgouw/graph_values.yml
+++ b/datasets/GM1641_maasgouw/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1966.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15620050896726687
-    :network_gas: 0.14089720068003214
-    :ambient_heat: 0.7029022903527009
+    :electricity: 0.18913545952728683
+    :network_gas: 0.1488891774196139
+    :ambient_heat: 0.6619753630530993
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10946.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 268.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21722277326135345
-    :network_gas: 0.13110890695458385
-    :ambient_heat: 0.6516683197840627
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad
index 6d66b28161..c7637fdef1 100644
--- a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad
+++ b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1652_gemert_bakel
-- id = 128607
-- parent_id = 128607
+- id = 129295
+- parent_id = 129295
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1652_gemert_bakel/graph_values.yml b/datasets/GM1652_gemert_bakel/graph_values.yml
index 977481c396..32b95e74ec 100644
--- a/datasets/GM1652_gemert_bakel/graph_values.yml
+++ b/datasets/GM1652_gemert_bakel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2427.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1567108673317001
-    :network_gas: 0.1380902296756495
-    :ambient_heat: 0.7051989029926504
+    :electricity: 0.1897886006254974
+    :network_gas: 0.14595003814478696
+    :ambient_heat: 0.6642613612297156
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12601.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 138.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.217883055189897
-    :network_gas: 0.12846777924040972
-    :ambient_heat: 0.6536491655696933
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad
index 44ea1b70fb..b1c5af9072 100644
--- a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad
+++ b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1655_halderberge
-- id = 128621
-- parent_id = 128621
+- id = 129309
+- parent_id = 129309
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1655_halderberge/graph_values.yml b/datasets/GM1655_halderberge/graph_values.yml
index 38f12acb1d..73861ada05 100644
--- a/datasets/GM1655_halderberge/graph_values.yml
+++ b/datasets/GM1655_halderberge/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1986.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15520537239920987
-    :network_gas: 0.14637045180434557
-    :ambient_heat: 0.6984241757964444
+    :electricity: 0.18786261003715057
+    :network_gas: 0.15461700856919594
+    :ambient_heat: 0.6575203813936535
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13469.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 281.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2159344415843547
-    :network_gas: 0.13626223366257878
-    :ambient_heat: 0.6478033247530665
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad
index 3f15b8d6fa..152cf21c26 100644
--- a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad
+++ b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1658_heeze_leende
-- id = 128632
-- parent_id = 128632
+- id = 129320
+- parent_id = 129320
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1658_heeze_leende/graph_values.yml b/datasets/GM1658_heeze_leende/graph_values.yml
index d30a916db8..01afbb0c11 100644
--- a/datasets/GM1658_heeze_leende/graph_values.yml
+++ b/datasets/GM1658_heeze_leende/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1483.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1556591873947409
-    :network_gas: 0.14387446932892484
-    :ambient_heat: 0.7004663432763342
+    :electricity: 0.1884429571756573
+    :network_gas: 0.15200544259594498
+    :ambient_heat: 0.6595516002283978
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6905.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 70.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21652210467348296
-    :network_gas: 0.13391158130606576
-    :ambient_heat: 0.6495663140204512
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad
index 4260660f90..8aa586e876 100644
--- a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad
+++ b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1659_laarbeek
-- id = 128660
-- parent_id = 128660
+- id = 129348
+- parent_id = 129348
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1659_laarbeek/graph_values.yml b/datasets/GM1659_laarbeek/graph_values.yml
index 23c4f5d5c5..ce42f59f17 100644
--- a/datasets/GM1659_laarbeek/graph_values.yml
+++ b/datasets/GM1659_laarbeek/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1407.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15580022183578196
-    :network_gas: 0.14309877990319936
-    :ambient_heat: 0.7011009982610188
+    :electricity: 0.18862335362094831
+    :network_gas: 0.1511936573954017
+    :ambient_heat: 0.66018298898365
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9783.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 74.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21670468745506705
-    :network_gas: 0.13318125017972957
-    :ambient_heat: 0.6501140623652034
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad
index 4be99f2010..502fdd4a9c 100644
--- a/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad
+++ b/datasets/GM1667_reusel_de_mierden/GM1667_reusel_de_mierden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1667_reusel_de_mierden
-- id = 128734
-- parent_id = 128734
+- id = 129422
+- parent_id = 129422
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1667_reusel_de_mierden/graph_values.yml b/datasets/GM1667_reusel_de_mierden/graph_values.yml
index 550ab98cde..fbef69d9bd 100644
--- a/datasets/GM1667_reusel_de_mierden/graph_values.yml
+++ b/datasets/GM1667_reusel_de_mierden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 854.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15795230492126064
-    :network_gas: 0.13126232293306653
-    :ambient_heat: 0.7107853721456728
+    :electricity: 0.19137836597396973
+    :network_gas: 0.13879608353030162
+    :ambient_heat: 0.6698255504957287
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 5509.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 16.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2194879287735568
-    :network_gas: 0.12204828490577037
-    :ambient_heat: 0.6584637863206727
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad
index 50693492a7..820d6cdbfa 100644
--- a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad
+++ b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1669_roerdalen
-- id = 128740
-- parent_id = 128740
+- id = 129428
+- parent_id = 129428
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1669_roerdalen/graph_values.yml b/datasets/GM1669_roerdalen/graph_values.yml
index 879b539d0f..60384d4abb 100644
--- a/datasets/GM1669_roerdalen/graph_values.yml
+++ b/datasets/GM1669_roerdalen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2776.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15596929384697106
-    :network_gas: 0.14216888384165946
-    :ambient_heat: 0.7018618223113696
+    :electricity: 0.18883963713249854
+    :network_gas: 0.15022038015862013
+    :ambient_heat: 0.6609399827088812
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9538.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 53.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21692353740284206
-    :network_gas: 0.1323058503886294
-    :ambient_heat: 0.6507706122085285
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad
index 359d7313d7..46f1bd0602 100644
--- a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad
+++ b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1674_roosendaal
-- id = 128742
-- parent_id = 128742
+- id = 129430
+- parent_id = 129430
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1674_roosendaal/graph_values.yml b/datasets/GM1674_roosendaal/graph_values.yml
index 9ede64cd24..1f9a7a2531 100644
--- a/datasets/GM1674_roosendaal/graph_values.yml
+++ b/datasets/GM1674_roosendaal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8527.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15324329668348693
-    :network_gas: 0.15716186824082182
-    :ambient_heat: 0.6895948350756912
+    :electricity: 0.18535566966516837
+    :network_gas: 0.16589825687393242
+    :ambient_heat: 0.6487460734608993
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 35586.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 935.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.213390938085616
-    :network_gas: 0.1464362476575338
-    :ambient_heat: 0.6401728142568504
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad
index cf57f68fb2..0002812050 100644
--- a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad
+++ b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1676_schouwen_duiveland
-- id = 128750
-- parent_id = 128750
+- id = 129438
+- parent_id = 129438
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1676_schouwen_duiveland/graph_values.yml b/datasets/GM1676_schouwen_duiveland/graph_values.yml
index 543529a692..f3bd4dafe1 100644
--- a/datasets/GM1676_schouwen_duiveland/graph_values.yml
+++ b/datasets/GM1676_schouwen_duiveland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6297.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15412338705882908
-    :network_gas: 0.15232137117644
-    :ambient_heat: 0.6935552417647308
+    :electricity: 0.18647971795877655
+    :network_gas: 0.16084003209586045
+    :ambient_heat: 0.652680249945363
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16968.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1124.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21453237780883463
-    :network_gas: 0.1418704887646591
-    :ambient_heat: 0.6435971334265063
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad
index 22134ce91b..263d376874 100644
--- a/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad
+++ b/datasets/GM1680_aa_en_hunze/GM1680_aa_en_hunze.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1680_aa_en_hunze
-- id = 128513
-- parent_id = 128513
+- id = 129201
+- parent_id = 129201
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1680_aa_en_hunze/graph_values.yml b/datasets/GM1680_aa_en_hunze/graph_values.yml
index 62aa4f0f46..ff8996c145 100644
--- a/datasets/GM1680_aa_en_hunze/graph_values.yml
+++ b/datasets/GM1680_aa_en_hunze/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2206.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15263935609033782
-    :network_gas: 0.16048354150314192
-    :ambient_heat: 0.6868771024065202
+    :electricity: 0.1845847340381508
+    :network_gas: 0.16936747230982896
+    :ambient_heat: 0.6460477936520204
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11030.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 13.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2126071350517391
-    :network_gas: 0.14957145979304146
-    :ambient_heat: 0.6378214051552195
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad
index 24368ca6af..e45b5d73fa 100644
--- a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad
+++ b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1681_borger_odoorn
-- id = 128553
-- parent_id = 128553
+- id = 129241
+- parent_id = 129241
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1681_borger_odoorn/graph_values.yml b/datasets/GM1681_borger_odoorn/graph_values.yml
index 2f14519178..930c8de303 100644
--- a/datasets/GM1681_borger_odoorn/graph_values.yml
+++ b/datasets/GM1681_borger_odoorn/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1817.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1489430995286598
-    :network_gas: 0.18081295259237115
-    :ambient_heat: 0.6702439478789691
+    :electricity: 0.17987377765586163
+    :network_gas: 0.19056680728219022
+    :ambient_heat: 0.6295594150619481
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11192.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 0.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2078008743473639
-    :network_gas: 0.16879650261054213
-    :ambient_heat: 0.6234026230420939
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad
index d2457e6172..68c3d69cae 100644
--- a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad
+++ b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1690_de_wolden
-- id = 128574
-- parent_id = 128574
+- id = 129262
+- parent_id = 129262
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1690_de_wolden/graph_values.yml b/datasets/GM1690_de_wolden/graph_values.yml
index 9b10f0c388..a82a48eca0 100644
--- a/datasets/GM1690_de_wolden/graph_values.yml
+++ b/datasets/GM1690_de_wolden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1890.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15218968207442332
-    :network_gas: 0.16295674859067188
-    :ambient_heat: 0.6848535693349049
+    :electricity: 0.1840109403926962
+    :network_gas: 0.17194954752086988
+    :ambient_heat: 0.644039512086434
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10429.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 6.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2120232675016309
-    :network_gas: 0.151906929993474
-    :ambient_heat: 0.636069802504895
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad
index 2bc773faba..b534a2483a 100644
--- a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad
+++ b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1695_noord_beveland
-- id = 128699
-- parent_id = 128699
+- id = 129387
+- parent_id = 129387
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1695_noord_beveland/graph_values.yml b/datasets/GM1695_noord_beveland/graph_values.yml
index 4f80b24f15..239d840087 100644
--- a/datasets/GM1695_noord_beveland/graph_values.yml
+++ b/datasets/GM1695_noord_beveland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2013.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15571173686148093
-    :network_gas: 0.14358544726185477
-    :ambient_heat: 0.7007028158766643
+    :electricity: 0.18851017077527304
+    :network_gas: 0.1517029809517852
+    :ambient_heat: 0.6597868482729418
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4552.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 456.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21659013773979555
-    :network_gas: 0.13363944904081562
-    :ambient_heat: 0.6497704132193889
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad
index e5b8bce21d..2e33d50311 100644
--- a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad
+++ b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1696_wijdemeren
-- id = 128816
-- parent_id = 128816
+- id = 129504
+- parent_id = 129504
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1696_wijdemeren/graph_values.yml b/datasets/GM1696_wijdemeren/graph_values.yml
index 060714ab6b..0d337738f3 100644
--- a/datasets/GM1696_wijdemeren/graph_values.yml
+++ b/datasets/GM1696_wijdemeren/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2219.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15198190491244587
-    :network_gas: 0.1640995229815477
-    :ambient_heat: 0.6839185721060065
+    :electricity: 0.18374587549867719
+    :network_gas: 0.173142341302372
+    :ambient_heat: 0.6431117831989507
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 10783.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 268.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2117534056063192
-    :network_gas: 0.1529863775747209
-    :ambient_heat: 0.6352602168189599
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad
index 272a44ca76..f853eeded4 100644
--- a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad
+++ b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1699_noordenveld
-- id = 128700
-- parent_id = 128700
+- id = 129388
+- parent_id = 129388
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1699_noordenveld/graph_values.yml b/datasets/GM1699_noordenveld/graph_values.yml
index aa4614578e..a3348a8387 100644
--- a/datasets/GM1699_noordenveld/graph_values.yml
+++ b/datasets/GM1699_noordenveld/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2946.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1503151145452154
-    :network_gas: 0.17326687000131535
-    :ambient_heat: 0.6764180154534692
+    :electricity: 0.1816209667715617
+    :network_gas: 0.18270444467084473
+    :ambient_heat: 0.6356745885575935
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14831.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 26.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20958676130302997
-    :network_gas: 0.16165295478787772
-    :ambient_heat: 0.6287602839090922
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad
index ed624b82b2..635684a219 100644
--- a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad
+++ b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1700_twenterand
-- id = 128777
-- parent_id = 128777
+- id = 129465
+- parent_id = 129465
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1700_twenterand/graph_values.yml b/datasets/GM1700_twenterand/graph_values.yml
index cb8b94b37c..828b9db9e9 100644
--- a/datasets/GM1700_twenterand/graph_values.yml
+++ b/datasets/GM1700_twenterand/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2783.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15331501217682808
-    :network_gas: 0.1567674330274456
-    :ambient_heat: 0.6899175547957264
+    :electricity: 0.18544723757839363
+    :network_gas: 0.1654862006569653
+    :ambient_heat: 0.6490665617646411
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 13808.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 16.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21348398350879955
-    :network_gas: 0.14606406596479965
-    :ambient_heat: 0.6404519505264009
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad
index 659ee4f81e..a0f8e811e9 100644
--- a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad
+++ b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1701_westerveld
-- id = 128810
-- parent_id = 128810
+- id = 129498
+- parent_id = 129498
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1701_westerveld/graph_values.yml b/datasets/GM1701_westerveld/graph_values.yml
index 8cb48ce871..bedd558c67 100644
--- a/datasets/GM1701_westerveld/graph_values.yml
+++ b/datasets/GM1701_westerveld/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2027.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1528418760817832
-    :network_gas: 0.15936968155019238
-    :ambient_heat: 0.6877884423680245
+    :electricity: 0.18484321499966241
+    :network_gas: 0.1682043062682873
+    :ambient_heat: 0.6469524787320504
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8415.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 27.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21287001548684586
-    :network_gas: 0.1485199380526142
-    :ambient_heat: 0.6386100464605399
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad
index 576f52a85b..a8cfaf474f 100644
--- a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad
+++ b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1705_lingewaard
-- id = 128672
-- parent_id = 128672
+- id = 129360
+- parent_id = 129360
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1705_lingewaard/graph_values.yml b/datasets/GM1705_lingewaard/graph_values.yml
index 34202fef83..1e6425a718 100644
--- a/datasets/GM1705_lingewaard/graph_values.yml
+++ b/datasets/GM1705_lingewaard/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3198.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15653807169557585
-    :network_gas: 0.13904060567433268
-    :ambient_heat: 0.7044213226300914
+    :electricity: 0.18956743491996006
+    :network_gas: 0.14694528528689846
+    :ambient_heat: 0.6634872797931415
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20045.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 69.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2176595324319384
-    :network_gas: 0.12936187027224408
-    :ambient_heat: 0.6529785972958174
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad
index 2bc776a1d2..a343fefb4a 100644
--- a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad
+++ b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1706_cranendonck
-- id = 128567
-- parent_id = 128567
+- id = 129255
+- parent_id = 129255
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1706_cranendonck/graph_values.yml b/datasets/GM1706_cranendonck/graph_values.yml
index 9d9b6675c5..3cd724579a 100644
--- a/datasets/GM1706_cranendonck/graph_values.yml
+++ b/datasets/GM1706_cranendonck/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1770.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15370918777463422
-    :network_gas: 0.15459946723951165
-    :ambient_heat: 0.691691344985854
+    :electricity: 0.1859506146892078
+    :network_gas: 0.16322100031894327
+    :ambient_heat: 0.6508283849918489
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 9032.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 112.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21399529041833343
-    :network_gas: 0.14401883832666415
-    :ambient_heat: 0.6419858712550025
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad
index 82f38aaa46..a4b79ef597 100644
--- a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad
+++ b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1708_steenwijkerland
-- id = 128765
-- parent_id = 128765
+- id = 129453
+- parent_id = 129453
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1708_steenwijkerland/graph_values.yml b/datasets/GM1708_steenwijkerland/graph_values.yml
index 0aa527b31c..bba51508cd 100644
--- a/datasets/GM1708_steenwijkerland/graph_values.yml
+++ b/datasets/GM1708_steenwijkerland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4033.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15063393292202049
-    :network_gas: 0.17151336892888736
-    :ambient_heat: 0.6778526981490922
+    :electricity: 0.18202721402300912
+    :network_gas: 0.18087632934432377
+    :ambient_heat: 0.6370964566326672
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20197.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 560.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21000143923059414
-    :network_gas: 0.15999424307762122
-    :ambient_heat: 0.6300043176917847
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad
index 5943f3be24..a0be274100 100644
--- a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad
+++ b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1709_moerdijk
-- id = 128688
-- parent_id = 128688
+- id = 129376
+- parent_id = 129376
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1709_moerdijk/graph_values.yml b/datasets/GM1709_moerdijk/graph_values.yml
index 075bc61124..d8b3fda10f 100644
--- a/datasets/GM1709_moerdijk/graph_values.yml
+++ b/datasets/GM1709_moerdijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3585.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15513053805535953
-    :network_gas: 0.14678204069552264
-    :ambient_heat: 0.6980874212491178
+    :electricity: 0.18776692883738338
+    :network_gas: 0.15504757460288865
+    :ambient_heat: 0.6571854965597279
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16616.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 332.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21583751282041944
-    :network_gas: 0.1366499487183199
-    :ambient_heat: 0.6475125384612607
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad
index 0f4d02ce8f..0d0f9e9625 100644
--- a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad
+++ b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1711_echt_susteren
-- id = 128591
-- parent_id = 128591
+- id = 129279
+- parent_id = 129279
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1711_echt_susteren/graph_values.yml b/datasets/GM1711_echt_susteren/graph_values.yml
index 00bb3711fc..e2aaac3729 100644
--- a/datasets/GM1711_echt_susteren/graph_values.yml
+++ b/datasets/GM1711_echt_susteren/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3442.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15566299972794123
-    :network_gas: 0.14385350149632326
-    :ambient_heat: 0.7004834987757356
+    :electricity: 0.18844783326896716
+    :network_gas: 0.15198350014370282
+    :ambient_heat: 0.6595686665873299
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14672.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 387.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2165270404103588
-    :network_gas: 0.13389183835856242
-    :ambient_heat: 0.6495811212310787
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1714_sluis/GM1714_sluis.derived.ad b/datasets/GM1714_sluis/GM1714_sluis.derived.ad
index a29352c201..1b1488b9c1 100644
--- a/datasets/GM1714_sluis/GM1714_sluis.derived.ad
+++ b/datasets/GM1714_sluis/GM1714_sluis.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1714_sluis
-- id = 128756
-- parent_id = 128756
+- id = 129444
+- parent_id = 129444
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1714_sluis/graph_values.yml b/datasets/GM1714_sluis/graph_values.yml
index ecf87e175c..adfbcec5a4 100644
--- a/datasets/GM1714_sluis/graph_values.yml
+++ b/datasets/GM1714_sluis/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6303.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15038044119842683
-    :network_gas: 0.17290757340865234
-    :ambient_heat: 0.6767119853929208
+    :electricity: 0.1817042001653975
+    :network_gas: 0.18232989384642073
+    :ambient_heat: 0.6359659059881817
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14123.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 747.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2096717394134342
-    :network_gas: 0.161313042346261
-    :ambient_heat: 0.6290152182403048
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad
index 2d21d18412..7c24f4773c 100644
--- a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad
+++ b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1719_drimmelen
-- id = 128587
-- parent_id = 128587
+- id = 129275
+- parent_id = 129275
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1719_drimmelen/graph_values.yml b/datasets/GM1719_drimmelen/graph_values.yml
index c101f82266..7c2ae85164 100644
--- a/datasets/GM1719_drimmelen/graph_values.yml
+++ b/datasets/GM1719_drimmelen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1434.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15572845101401545
-    :network_gas: 0.14349351942291505
-    :ambient_heat: 0.7007780295630694
+    :electricity: 0.18853154961463284
+    :network_gas: 0.15160677603284065
+    :ambient_heat: 0.6598616743525264
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11831.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 131.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21661177601857545
-    :network_gas: 0.133552895925696
-    :ambient_heat: 0.6498353280557286
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad
index 8c659d78e2..2e0391d5ac 100644
--- a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad
+++ b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1721_bernheze
-- id = 128544
-- parent_id = 128544
+- id = 129232
+- parent_id = 129232
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1721_bernheze/graph_values.yml b/datasets/GM1721_bernheze/graph_values.yml
index 0c6ead0bba..97cc7b0a88 100644
--- a/datasets/GM1721_bernheze/graph_values.yml
+++ b/datasets/GM1721_bernheze/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1844.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1569329374232548
-    :network_gas: 0.13686884417209855
-    :ambient_heat: 0.7061982184046466
+    :electricity: 0.19007287477703444
+    :network_gas: 0.14467080257702133
+    :ambient_heat: 0.6652563226459443
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 12775.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 21.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21817026733221279
-    :network_gas: 0.12731893067114655
-    :ambient_heat: 0.6545108019966407
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad
index 04c153562f..e361326c06 100644
--- a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad
+++ b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1723_alphen_chaam
-- id = 128523
-- parent_id = 128523
+- id = 129211
+- parent_id = 129211
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1723_alphen_chaam/graph_values.yml b/datasets/GM1723_alphen_chaam/graph_values.yml
index 900bd0f5cd..2dda3f5d60 100644
--- a/datasets/GM1723_alphen_chaam/graph_values.yml
+++ b/datasets/GM1723_alphen_chaam/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2734.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1556568151939548
-    :network_gas: 0.1438875164332486
-    :ambient_heat: 0.7004556683727967
+    :electricity: 0.18843992306352625
+    :network_gas: 0.1520190961206626
+    :ambient_heat: 0.659540980815811
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 4407.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 16.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21651903343324888
-    :network_gas: 0.13392386626700215
-    :ambient_heat: 0.6495571002997489
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad
index dba699acbe..6b29dd3605 100644
--- a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad
+++ b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1724_bergeijk
-- id = 128539
-- parent_id = 128539
+- id = 129227
+- parent_id = 129227
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1724_bergeijk/graph_values.yml b/datasets/GM1724_bergeijk/graph_values.yml
index d93dc173c3..93c1f9b4a5 100644
--- a/datasets/GM1724_bergeijk/graph_values.yml
+++ b/datasets/GM1724_bergeijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1733.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15643965563054954
-    :network_gas: 0.1395818940319774
-    :ambient_heat: 0.703978450337473
+    :electricity: 0.18944148200198369
+    :network_gas: 0.14751207425335244
+    :ambient_heat: 0.6630464437446638
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7994.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 15.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21753220928889577
-    :network_gas: 0.12987116284441452
-    :ambient_heat: 0.6525966278666897
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1728_bladel/GM1728_bladel.derived.ad b/datasets/GM1728_bladel/GM1728_bladel.derived.ad
index 4d22fd5240..341b009ad3 100644
--- a/datasets/GM1728_bladel/GM1728_bladel.derived.ad
+++ b/datasets/GM1728_bladel/GM1728_bladel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1728_bladel
-- id = 128548
-- parent_id = 128548
+- id = 129236
+- parent_id = 129236
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1728_bladel/graph_values.yml b/datasets/GM1728_bladel/graph_values.yml
index b0f47d90da..b2431d4466 100644
--- a/datasets/GM1728_bladel/graph_values.yml
+++ b/datasets/GM1728_bladel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2347.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15661426754758848
-    :network_gas: 0.13862152848826334
-    :ambient_heat: 0.7047642039641482
+    :electricity: 0.1896649565849317
+    :network_gas: 0.1465064371475761
+    :ambient_heat: 0.6638286062674922
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8820.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 24.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2177581011166876
-    :network_gas: 0.1289675955332472
-    :ambient_heat: 0.6532743033500652
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad
index 58fb3d73fb..1e9744958e 100644
--- a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad
+++ b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1729_gulpen_wittem
-- id = 128617
-- parent_id = 128617
+- id = 129305
+- parent_id = 129305
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1729_gulpen_wittem/graph_values.yml b/datasets/GM1729_gulpen_wittem/graph_values.yml
index 2c90f85c06..7fc64e41df 100644
--- a/datasets/GM1729_gulpen_wittem/graph_values.yml
+++ b/datasets/GM1729_gulpen_wittem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1537.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1531117309520375
-    :network_gas: 0.15788547976379375
-    :ambient_heat: 0.6890027892841688
+    :electricity: 0.18518769604319682
+    :network_gas: 0.16665413928712622
+    :ambient_heat: 0.6481581646696771
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 6866.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 313.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21322022605560695
-    :network_gas: 0.14711909577756993
-    :ambient_heat: 0.6396606781668231
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad
index ecac0a9ae0..41d95fa6f6 100644
--- a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad
+++ b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1730_tynaarlo
-- id = 128778
-- parent_id = 128778
+- id = 129466
+- parent_id = 129466
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1730_tynaarlo/graph_values.yml b/datasets/GM1730_tynaarlo/graph_values.yml
index acc834098f..74d32b3b7b 100644
--- a/datasets/GM1730_tynaarlo/graph_values.yml
+++ b/datasets/GM1730_tynaarlo/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3920.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15092551627920625
-    :network_gas: 0.16990966046436573
-    :ambient_heat: 0.6791648232564281
+    :electricity: 0.1823988398527457
+    :network_gas: 0.17920401064517688
+    :ambient_heat: 0.6383971495020774
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14575.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 22.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2103805901464551
-    :network_gas: 0.15847763941417747
-    :ambient_heat: 0.6311417704393675
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad
index b59392f199..a873ac78aa 100644
--- a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad
+++ b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1731_midden_drenthe
-- id = 128687
-- parent_id = 128687
+- id = 129375
+- parent_id = 129375
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1731_midden_drenthe/graph_values.yml b/datasets/GM1731_midden_drenthe/graph_values.yml
index 343adc7518..7a3e1bda3e 100644
--- a/datasets/GM1731_midden_drenthe/graph_values.yml
+++ b/datasets/GM1731_midden_drenthe/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3322.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15256034750968944
-    :network_gas: 0.16091808869670804
-    :ambient_heat: 0.6865215637936025
+    :electricity: 0.18448390385009766
+    :network_gas: 0.16982120882496626
+    :ambient_heat: 0.6456948873249361
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14395.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 20.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21250456535109524
-    :network_gas: 0.14998173859561664
-    :ambient_heat: 0.637513696053288
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad
index 799fc247b0..1c2a706dc2 100644
--- a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad
+++ b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1734_overbetuwe
-- id = 128723
-- parent_id = 128723
+- id = 129411
+- parent_id = 129411
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1734_overbetuwe/graph_values.yml b/datasets/GM1734_overbetuwe/graph_values.yml
index 5417034654..387fb2e54e 100644
--- a/datasets/GM1734_overbetuwe/graph_values.yml
+++ b/datasets/GM1734_overbetuwe/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4017.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15361454067596375
-    :network_gas: 0.1551200262821994
-    :ambient_heat: 0.6912654330418369
+    :electricity: 0.1858297336387081
+    :network_gas: 0.16376496584810585
+    :ambient_heat: 0.6504053005131861
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20053.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 37.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2138725348203516
-    :network_gas: 0.1445098607185914
-    :ambient_heat: 0.6416176044610571
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad
index 3287def56e..393b92e24c 100644
--- a/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad
+++ b/datasets/GM1735_hof_van_twente/GM1735_hof_van_twente.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1735_hof_van_twente
-- id = 128643
-- parent_id = 128643
+- id = 129331
+- parent_id = 129331
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1735_hof_van_twente/graph_values.yml b/datasets/GM1735_hof_van_twente/graph_values.yml
index ebfb71ccb8..3cb3408d29 100644
--- a/datasets/GM1735_hof_van_twente/graph_values.yml
+++ b/datasets/GM1735_hof_van_twente/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3451.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15222833758962412
-    :network_gas: 0.16274414325706743
-    :ambient_heat: 0.6850275191533085
+    :electricity: 0.18406025830396994
+    :network_gas: 0.17172761659296765
+    :ambient_heat: 0.6442121251030626
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15251.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 266.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2120734679430009
-    :network_gas: 0.15170612822799423
-    :ambient_heat: 0.6362204038290049
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad
index 7635b1a758..e1332be1f1 100644
--- a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad
+++ b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1740_neder_betuwe
-- id = 128692
-- parent_id = 128692
+- id = 129380
+- parent_id = 129380
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1740_neder_betuwe/graph_values.yml b/datasets/GM1740_neder_betuwe/graph_values.yml
index 4a1565d504..4402466f37 100644
--- a/datasets/GM1740_neder_betuwe/graph_values.yml
+++ b/datasets/GM1740_neder_betuwe/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1705.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1552896437968816
-    :network_gas: 0.14590695911715124
-    :ambient_heat: 0.6988033970859672
+    :electricity: 0.18797036342594875
+    :network_gas: 0.15413211760477788
+    :ambient_heat: 0.6578975189692734
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8886.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 20.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21604358591220632
-    :network_gas: 0.13582565635117233
-    :ambient_heat: 0.6481307577366212
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad
index e5d304bd0e..86f38a717f 100644
--- a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad
+++ b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1742_rijssen_holten
-- id = 128738
-- parent_id = 128738
+- id = 129426
+- parent_id = 129426
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1742_rijssen_holten/graph_values.yml b/datasets/GM1742_rijssen_holten/graph_values.yml
index 06ab618fde..2bbacd9c61 100644
--- a/datasets/GM1742_rijssen_holten/graph_values.yml
+++ b/datasets/GM1742_rijssen_holten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3086.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1531112887443076
-    :network_gas: 0.15788791190630816
-    :ambient_heat: 0.6890007993493842
+    :electricity: 0.18518713149134491
+    :network_gas: 0.16665667977420473
+    :ambient_heat: 0.6481561887344502
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14849.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 37.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21321965223887934
-    :network_gas: 0.14712139104448038
-    :ambient_heat: 0.6396589567166403
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad
index f9bf6e64e9..ff83464f10 100644
--- a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad
+++ b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1771_geldrop_mierlo
-- id = 128606
-- parent_id = 128606
+- id = 129294
+- parent_id = 129294
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1771_geldrop_mierlo/graph_values.yml b/datasets/GM1771_geldrop_mierlo/graph_values.yml
index fa7d8795a9..ec568cac9c 100644
--- a/datasets/GM1771_geldrop_mierlo/graph_values.yml
+++ b/datasets/GM1771_geldrop_mierlo/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3031.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15474296459235082
-    :network_gas: 0.1489136947420705
-    :ambient_heat: 0.6963433406655787
+    :electricity: 0.18727147089150617
+    :network_gas: 0.15727713864615941
+    :ambient_heat: 0.6554513904623344
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18051.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 167.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2153354071591649
-    :network_gas: 0.13865837136333817
-    :ambient_heat: 0.646006221477497
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad
index d677e42094..edb0bfc1f9 100644
--- a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad
+++ b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1773_olst_wijhe
-- id = 128711
-- parent_id = 128711
+- id = 129399
+- parent_id = 129399
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1773_olst_wijhe/graph_values.yml b/datasets/GM1773_olst_wijhe/graph_values.yml
index e572840773..0348a93d95 100644
--- a/datasets/GM1773_olst_wijhe/graph_values.yml
+++ b/datasets/GM1773_olst_wijhe/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1146.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15411188391021308
-    :network_gas: 0.1523846384938281
-    :ambient_heat: 0.6935034775959588
+    :electricity: 0.18646502154782274
+    :network_gas: 0.16090616604264715
+    :ambient_heat: 0.6526288124095301
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7821.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 88.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21451746448388617
-    :network_gas: 0.14193014206445304
-    :ambient_heat: 0.6435523934516608
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad
index 815f03490d..035af0547d 100644
--- a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad
+++ b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1774_dinkelland
-- id = 128581
-- parent_id = 128581
+- id = 129269
+- parent_id = 129269
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1774_dinkelland/graph_values.yml b/datasets/GM1774_dinkelland/graph_values.yml
index f008468488..5a301cce33 100644
--- a/datasets/GM1774_dinkelland/graph_values.yml
+++ b/datasets/GM1774_dinkelland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3197.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1538583572153983
-    :network_gas: 0.15377903531530931
-    :ambient_heat: 0.6923626074692923
+    :electricity: 0.18614114724757433
+    :network_gas: 0.16236360254231794
+    :ambient_heat: 0.6514952502101077
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11038.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 55.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.214188739519476
-    :network_gas: 0.14324504192209359
-    :ambient_heat: 0.6425662185584303
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1783_westland/GM1783_westland.derived.ad b/datasets/GM1783_westland/GM1783_westland.derived.ad
index bb620f7c65..be1ded7601 100644
--- a/datasets/GM1783_westland/GM1783_westland.derived.ad
+++ b/datasets/GM1783_westland/GM1783_westland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1783_westland
-- id = 128812
-- parent_id = 128812
+- id = 129500
+- parent_id = 129500
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1783_westland/graph_values.yml b/datasets/GM1783_westland/graph_values.yml
index f5a264729e..ec09180064 100644
--- a/datasets/GM1783_westland/graph_values.yml
+++ b/datasets/GM1783_westland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 9269.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15722703800209592
-    :network_gas: 0.13525129098847252
-    :ambient_heat: 0.7075216710094316
+    :electricity: 0.1904494264718103
+    :network_gas: 0.1429763174525199
+    :ambient_heat: 0.6665742560756698
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 45912.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1775.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21855055210599425
-    :network_gas: 0.12579779157602058
-    :ambient_heat: 0.6556516563179852
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad
index 312c6da74a..bfeb262bd5 100644
--- a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad
+++ b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1842_midden_delfland
-- id = 128686
-- parent_id = 128686
+- id = 129374
+- parent_id = 129374
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1842_midden_delfland/graph_values.yml b/datasets/GM1842_midden_delfland/graph_values.yml
index 4b0f292841..7a0067cd2c 100644
--- a/datasets/GM1842_midden_delfland/graph_values.yml
+++ b/datasets/GM1842_midden_delfland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1157.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15744467093425527
-    :network_gas: 0.13405430986159603
-    :ambient_heat: 0.7085010192041487
+    :electricity: 0.19072812461425437
+    :network_gas: 0.1417221739626631
+    :ambient_heat: 0.6675497014230825
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 7978.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 273.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2188318968916586
-    :network_gas: 0.12467241243336327
-    :ambient_heat: 0.6564956906749781
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad
index 643e43411f..c347a8f96f 100644
--- a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad
+++ b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1859_berkelland
-- id = 128543
-- parent_id = 128543
+- id = 129231
+- parent_id = 129231
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1859_berkelland/graph_values.yml b/datasets/GM1859_berkelland/graph_values.yml
index 619b7464ea..9c70e1842f 100644
--- a/datasets/GM1859_berkelland/graph_values.yml
+++ b/datasets/GM1859_berkelland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3522.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1516340145816958
-    :network_gas: 0.16601291980067318
-    :ambient_heat: 0.6823530656176311
+    :electricity: 0.18330215523382337
+    :network_gas: 0.17513908543781453
+    :ambient_heat: 0.6415587593283621
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 19547.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 86.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21130145221495358
-    :network_gas: 0.15479419114018333
-    :ambient_heat: 0.633904356644863
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad
index c997de3715..710aa04590 100644
--- a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad
+++ b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1876_bronckhorst
-- id = 128558
-- parent_id = 128558
+- id = 129246
+- parent_id = 129246
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1876_bronckhorst/graph_values.yml b/datasets/GM1876_bronckhorst/graph_values.yml
index c725b7ee90..7bcc671263 100644
--- a/datasets/GM1876_bronckhorst/graph_values.yml
+++ b/datasets/GM1876_bronckhorst/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2734.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15360224167357064
-    :network_gas: 0.15518767079536144
-    :ambient_heat: 0.6912100875310679
+    :electricity: 0.18581402625130175
+    :network_gas: 0.1638356491956358
+    :ambient_heat: 0.6503503245530625
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16139.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 66.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21385658247411116
-    :network_gas: 0.14457367010355313
-    :ambient_heat: 0.6415697474223357
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad
index 798d0a8d5a..b4535aaed2 100644
--- a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad
+++ b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1883_sittard_geleen
-- id = 128754
-- parent_id = 128754
+- id = 129442
+- parent_id = 129442
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1883_sittard_geleen/graph_values.yml b/datasets/GM1883_sittard_geleen/graph_values.yml
index f4c9592683..e472664aea 100644
--- a/datasets/GM1883_sittard_geleen/graph_values.yml
+++ b/datasets/GM1883_sittard_geleen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 16157.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15552508110940744
-    :network_gas: 0.1446120538982594
-    :ambient_heat: 0.6998628649923334
+    :electricity: 0.1882714396339715
+    :network_gas: 0.15277727267136282
+    :ambient_heat: 0.6589512876946656
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 46679.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1935.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21634846981075945
-    :network_gas: 0.13460612075695985
-    :ambient_heat: 0.6490454094322807
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad
index 001acce754..b43782830a 100644
--- a/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad
+++ b/datasets/GM1884_kaag_en_braassem/GM1884_kaag_en_braassem.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1884_kaag_en_braassem
-- id = 128652
-- parent_id = 128652
+- id = 129340
+- parent_id = 129340
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1884_kaag_en_braassem/graph_values.yml b/datasets/GM1884_kaag_en_braassem/graph_values.yml
index 91581933f2..912a5d9f0b 100644
--- a/datasets/GM1884_kaag_en_braassem/graph_values.yml
+++ b/datasets/GM1884_kaag_en_braassem/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1969.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15757603221534028
-    :network_gas: 0.13333182281562841
-    :ambient_heat: 0.7090921449690313
+    :electricity: 0.19089636563675996
+    :network_gas: 0.14096508824529239
+    :ambient_heat: 0.6681385461179478
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11874.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 65.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2190016877322112
-    :network_gas: 0.12399324907115274
-    :ambient_heat: 0.657005063196636
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad
index d338989450..d939bcda14 100644
--- a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad
+++ b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1891_dantumadiel
-- id = 128570
-- parent_id = 128570
+- id = 129258
+- parent_id = 129258
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1891_dantumadiel/graph_values.yml b/datasets/GM1891_dantumadiel/graph_values.yml
index 7c70ccec4e..5f3302dd8c 100644
--- a/datasets/GM1891_dantumadiel/graph_values.yml
+++ b/datasets/GM1891_dantumadiel/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1158.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15216849750814546
-    :network_gas: 0.16307326370519998
-    :ambient_heat: 0.6847582387866545
+    :electricity: 0.18398391304912845
+    :network_gas: 0.1720711707462217
+    :ambient_heat: 0.6439449162046499
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8148.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 8.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21199575518091068
-    :network_gas: 0.15201697927635513
-    :ambient_heat: 0.6359872655427343
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad
index 5f0bf7b120..926664f218 100644
--- a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad
+++ b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1892_zuidplas
-- id = 128831
-- parent_id = 128831
+- id = 129519
+- parent_id = 129519
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1892_zuidplas/graph_values.yml b/datasets/GM1892_zuidplas/graph_values.yml
index 9fc151963b..cca105aa00 100644
--- a/datasets/GM1892_zuidplas/graph_values.yml
+++ b/datasets/GM1892_zuidplas/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2882.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1582141942177268
-    :network_gas: 0.12982193180250257
-    :ambient_heat: 0.7119638739797707
+    :electricity: 0.19171392048348618
+    :network_gas: 0.13728608601143905
+    :ambient_heat: 0.6709999935050747
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18549.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 123.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2198262610833705
-    :network_gas: 0.12069495566651563
-    :ambient_heat: 0.6594787832501138
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad
index b72ae18bb2..c52445a175 100644
--- a/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad
+++ b/datasets/GM1894_peel_en_maas/GM1894_peel_en_maas.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1894_peel_en_maas
-- id = 128725
-- parent_id = 128725
+- id = 129413
+- parent_id = 129413
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1894_peel_en_maas/graph_values.yml b/datasets/GM1894_peel_en_maas/graph_values.yml
index bc57ab95b8..e57d460a62 100644
--- a/datasets/GM1894_peel_en_maas/graph_values.yml
+++ b/datasets/GM1894_peel_en_maas/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3735.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15738509861512062
-    :network_gas: 0.13438195761683658
-    :ambient_heat: 0.7082329437680428
+    :electricity: 0.1906518326308554
+    :network_gas: 0.1420654883940727
+    :ambient_heat: 0.6672826789750719
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18491.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 82.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21875489023836897
-    :network_gas: 0.12498043904652181
-    :ambient_heat: 0.6562646707151093
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad
index ce8b663a2e..d263364447 100644
--- a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad
+++ b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1895_oldambt
-- id = 128708
-- parent_id = 128708
+- id = 129396
+- parent_id = 129396
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1895_oldambt/graph_values.yml b/datasets/GM1895_oldambt/graph_values.yml
index 26c7d90f70..bb21b37850 100644
--- a/datasets/GM1895_oldambt/graph_values.yml
+++ b/datasets/GM1895_oldambt/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3360.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1508640545846111
-    :network_gas: 0.17024769978463902
-    :ambient_heat: 0.6788882456307499
+    :electricity: 0.18232049979082224
+    :network_gas: 0.17955654144353328
+    :ambient_heat: 0.6381229587656444
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 18399.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 325.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2103006786340039
-    :network_gas: 0.15879728546398225
-    :ambient_heat: 0.6309020359020139
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad
index 3bc9093eb5..e9edaa1976 100644
--- a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad
+++ b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1896_zwartewaterland
-- id = 128834
-- parent_id = 128834
+- id = 129522
+- parent_id = 129522
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1896_zwartewaterland/graph_values.yml b/datasets/GM1896_zwartewaterland/graph_values.yml
index 476c6553bd..26ae1d0d94 100644
--- a/datasets/GM1896_zwartewaterland/graph_values.yml
+++ b/datasets/GM1896_zwartewaterland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 1963.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15454358818885208
-    :network_gas: 0.15001026496131342
-    :ambient_heat: 0.6954461468498344
+    :electricity: 0.18701665060418443
+    :network_gas: 0.15842383162956214
+    :ambient_heat: 0.6545595177662534
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 8961.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 505.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21507704536994227
-    :network_gas: 0.1396918185202286
-    :ambient_heat: 0.6452311361098292
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad
index 91742cb442..30e47ec455 100644
--- a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad
+++ b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1900_sudwest_fryslan
-- id = 128768
-- parent_id = 128768
+- id = 129456
+- parent_id = 129456
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1900_sudwest_fryslan/graph_values.yml b/datasets/GM1900_sudwest_fryslan/graph_values.yml
index 2a8cbd5121..b0a6079b36 100644
--- a/datasets/GM1900_sudwest_fryslan/graph_values.yml
+++ b/datasets/GM1900_sudwest_fryslan/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 9325.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15198613737912395
-    :network_gas: 0.16407624441481838
-    :ambient_heat: 0.6839376182060577
+    :electricity: 0.18375127453062326
+    :network_gas: 0.17311804562279798
+    :ambient_heat: 0.6431306798465787
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 42025.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 2651.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2117589032513061
-    :network_gas: 0.1529643869947733
-    :ambient_heat: 0.6352767097539206
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad
index a3902a701f..ae856dc43e 100644
--- a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad
+++ b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1901_bodegraven_reeuwijk
-- id = 128551
-- parent_id = 128551
+- id = 129239
+- parent_id = 129239
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml
index dbd76205d8..69c807667c 100644
--- a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml
+++ b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2793.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15695232840274473
-    :network_gas: 0.13676219378490398
-    :ambient_heat: 0.7062854778123513
+    :electricity: 0.19009769954148775
+    :network_gas: 0.1445590909722962
+    :ambient_heat: 0.6653432094862161
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 14665.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 367.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2181953437701272
-    :network_gas: 0.12721862491948896
-    :ambient_heat: 0.6545860313103838
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad
index 4bc0bc1308..16c66a1453 100644
--- a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad
+++ b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1903_eijsden_margraten
-- id = 128596
-- parent_id = 128596
+- id = 129284
+- parent_id = 129284
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1903_eijsden_margraten/graph_values.yml b/datasets/GM1903_eijsden_margraten/graph_values.yml
index 984ba7de72..616997aed4 100644
--- a/datasets/GM1903_eijsden_margraten/graph_values.yml
+++ b/datasets/GM1903_eijsden_margraten/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2679.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15425998892169754
-    :network_gas: 0.1515700609306635
-    :ambient_heat: 0.6941699501476389
+    :electricity: 0.18665424973922556
+    :network_gas: 0.16005463792601182
+    :ambient_heat: 0.6532911123347627
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11342.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 420.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21470946442491826
-    :network_gas: 0.14116214230032453
-    :ambient_heat: 0.6441283932747571
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad
index e4d1607955..b87e0a7d64 100644
--- a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad
+++ b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1904_stichtse_vecht
-- id = 128767
-- parent_id = 128767
+- id = 129455
+- parent_id = 129455
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1904_stichtse_vecht/graph_values.yml b/datasets/GM1904_stichtse_vecht/graph_values.yml
index c5b12bfa5e..ccc88b6f86 100644
--- a/datasets/GM1904_stichtse_vecht/graph_values.yml
+++ b/datasets/GM1904_stichtse_vecht/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4426.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1542273186907
-    :network_gas: 0.15174974720115
-    :ambient_heat: 0.69402293410815
+    :electricity: 0.1866125064678627
+    :network_gas: 0.16024248292406568
+    :ambient_heat: 0.6531450106080716
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 28716.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 851.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21466711366286403
-    :network_gas: 0.14133154534854167
-    :ambient_heat: 0.6440013409885944
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad
index e57b103013..0ea3976c1e 100644
--- a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad
+++ b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1911_hollands_kroon
-- id = 128644
-- parent_id = 128644
+- id = 129332
+- parent_id = 129332
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1911_hollands_kroon/graph_values.yml b/datasets/GM1911_hollands_kroon/graph_values.yml
index ba320893ed..433f0ec231 100644
--- a/datasets/GM1911_hollands_kroon/graph_values.yml
+++ b/datasets/GM1911_hollands_kroon/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3288.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15459325539243124
-    :network_gas: 0.1497370953416281
-    :ambient_heat: 0.6956696492659405
+    :electricity: 0.18708012613696182
+    :network_gas: 0.15813819131097295
+    :ambient_heat: 0.6547816825520653
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20923.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 247.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2151414108734974
-    :network_gas: 0.13943435650600808
-    :ambient_heat: 0.6454242326204944
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad
index 53eb155dde..63f2cf0985 100644
--- a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad
+++ b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1916_leidschendam_voorburg
-- id = 128668
-- parent_id = 128668
+- id = 129356
+- parent_id = 129356
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1916_leidschendam_voorburg/graph_values.yml b/datasets/GM1916_leidschendam_voorburg/graph_values.yml
index 544116f88b..1dedf9bd8d 100644
--- a/datasets/GM1916_leidschendam_voorburg/graph_values.yml
+++ b/datasets/GM1916_leidschendam_voorburg/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5985.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15062395664698178
-    :network_gas: 0.17156823844160024
-    :ambient_heat: 0.677807804911418
+    :electricity: 0.18201450055282434
+    :network_gas: 0.18093354004449524
+    :ambient_heat: 0.6370519594026804
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 36938.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 3154.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20998846516229136
-    :network_gas: 0.16004613935083237
-    :ambient_heat: 0.6299653954868764
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad
index 564e2d2d5a..d495580ebc 100644
--- a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad
+++ b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1924_goeree_overflakkee
-- id = 128610
-- parent_id = 128610
+- id = 129298
+- parent_id = 129298
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1924_goeree_overflakkee/graph_values.yml b/datasets/GM1924_goeree_overflakkee/graph_values.yml
index ceeafc48d8..34b4a47d00 100644
--- a/datasets/GM1924_goeree_overflakkee/graph_values.yml
+++ b/datasets/GM1924_goeree_overflakkee/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6955.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15561866472220875
-    :network_gas: 0.14409734402785196
-    :ambient_heat: 0.7002839912499393
+    :electricity: 0.18839112824529905
+    :network_gas: 0.1522386731263856
+    :ambient_heat: 0.6593701986283154
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22021.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1305.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21646963990099985
-    :network_gas: 0.1341214403959981
-    :ambient_heat: 0.649408919703002
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad
index eb8f6969ed..f9ac92167d 100644
--- a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad
+++ b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1926_pijnacker_nootdorp
-- id = 128727
-- parent_id = 128727
+- id = 129415
+- parent_id = 129415
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml
index 2551a6e85f..ad3b9ddb6c 100644
--- a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml
+++ b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3308.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1621740730024119
-    :network_gas: 0.10804259848673482
-    :ambient_heat: 0.7297833285108535
+    :electricity: 0.19679544429097598
+    :network_gas: 0.11441919516736399
+    :ambient_heat: 0.68878536054166
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 21791.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 406.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22493241096272515
-    :network_gas: 0.10027035614909699
-    :ambient_heat: 0.6747972328881778
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad
index dfe694cfff..247d6a5eb4 100644
--- a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad
+++ b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1930_nissewaard
-- id = 128698
-- parent_id = 128698
+- id = 129386
+- parent_id = 129386
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1930_nissewaard/graph_values.yml b/datasets/GM1930_nissewaard/graph_values.yml
index 4ff7e56d6e..cb7900087e 100644
--- a/datasets/GM1930_nissewaard/graph_values.yml
+++ b/datasets/GM1930_nissewaard/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6466.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1585135571852412
-    :network_gas: 0.1281754354811734
-    :ambient_heat: 0.7133110073335853
+    :electricity: 0.19209756764141434
+    :network_gas: 0.1355596712556817
+    :ambient_heat: 0.6723427611029039
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 39448.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 128.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22021290883497638
-    :network_gas: 0.11914836466009204
-    :ambient_heat: 0.6606387265049316
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad
index 86894a5ca7..1d06c39249 100644
--- a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad
+++ b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1931_krimpenerwaard
-- id = 128659
-- parent_id = 128659
+- id = 129347
+- parent_id = 129347
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1931_krimpenerwaard/graph_values.yml b/datasets/GM1931_krimpenerwaard/graph_values.yml
index 20fbb9e9e4..56dfb5f2ff 100644
--- a/datasets/GM1931_krimpenerwaard/graph_values.yml
+++ b/datasets/GM1931_krimpenerwaard/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3631.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15518718202181608
-    :network_gas: 0.14647049888001146
-    :ambient_heat: 0.6983423190981723
+    :electricity: 0.1878393518266656
+    :network_gas: 0.15472167067067114
+    :ambient_heat: 0.6574389775026633
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 23909.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 830.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21591088119394566
-    :network_gas: 0.13635647522421504
-    :ambient_heat: 0.6477326435818394
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad
index 622d328fa6..2ae05b9218 100644
--- a/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad
+++ b/datasets/GM1940_de_fryske_marren/GM1940_de_fryske_marren.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1940_de_fryske_marren
-- id = 128572
-- parent_id = 128572
+- id = 129260
+- parent_id = 129260
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1940_de_fryske_marren/graph_values.yml b/datasets/GM1940_de_fryske_marren/graph_values.yml
index c29164f855..ca652d6879 100644
--- a/datasets/GM1940_de_fryske_marren/graph_values.yml
+++ b/datasets/GM1940_de_fryske_marren/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5704.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15209536512095606
-    :network_gas: 0.16347549183474175
-    :ambient_heat: 0.6844291430443022
+    :electricity: 0.18389061368524734
+    :network_gas: 0.17249101850262644
+    :ambient_heat: 0.6436183678121263
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 23318.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 364.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2119007744189425
-    :network_gas: 0.15239690232422765
-    :ambient_heat: 0.6357023232568298
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad
index 312a5e3754..0678f92f2e 100644
--- a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad
+++ b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1942_gooise_meren
-- id = 128613
-- parent_id = 128613
+- id = 129301
+- parent_id = 129301
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1942_gooise_meren/graph_values.yml b/datasets/GM1942_gooise_meren/graph_values.yml
index 1aaa716eb2..70555a3652 100644
--- a/datasets/GM1942_gooise_meren/graph_values.yml
+++ b/datasets/GM1942_gooise_meren/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6396.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1495224345598031
-    :network_gas: 0.177626609921083
-    :ambient_heat: 0.6728509555191139
+    :electricity: 0.1806113185636995
+    :network_gas: 0.18724786830413986
+    :ambient_heat: 0.6321408131321606
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 26873.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 3613.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2085552339617661
-    :network_gas: 0.1657790641529336
-    :ambient_heat: 0.6256657018853005
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad
index 6d132c07f5..dc3e3e1034 100644
--- a/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad
+++ b/datasets/GM1945_berg_en_dal/GM1945_berg_en_dal.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1945_berg_en_dal
-- id = 128538
-- parent_id = 128538
+- id = 129226
+- parent_id = 129226
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1945_berg_en_dal/graph_values.yml b/datasets/GM1945_berg_en_dal/graph_values.yml
index 10cb6c5233..35cdc69747 100644
--- a/datasets/GM1945_berg_en_dal/graph_values.yml
+++ b/datasets/GM1945_berg_en_dal/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3849.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1543976173034571
-    :network_gas: 0.15081310483098578
-    :ambient_heat: 0.694789277865557
+    :electricity: 0.1868301105691801
+    :network_gas: 0.15926326302457136
+    :ambient_heat: 0.6539066264062485
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15815.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 88.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21488786001148832
-    :network_gas: 0.14044855995404432
-    :ambient_heat: 0.6446635800344673
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad
index 87e5aa1556..58512047fc 100644
--- a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad
+++ b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1948_meierijstad
-- id = 128837
-- parent_id = 128837
+- id = 129525
+- parent_id = 129525
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1948_meierijstad/graph_values.yml b/datasets/GM1948_meierijstad/graph_values.yml
index 62d7087323..1c10b1d3e0 100644
--- a/datasets/GM1948_meierijstad/graph_values.yml
+++ b/datasets/GM1948_meierijstad/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6741.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1567666084100448
-    :network_gas: 0.1377836537447536
-    :ambient_heat: 0.7054497378452016
+    :electricity: 0.1898599510282476
+    :network_gas: 0.14562896085907898
+    :ambient_heat: 0.6645110881126733
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 34829.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 245.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2179551526904395
-    :network_gas: 0.12817938923823968
-    :ambient_heat: 0.6538654580713208
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad
index 4d60fc1dfd..09b3d5f3d1 100644
--- a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad
+++ b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1949_waadhoeke
-- id = 128838
-- parent_id = 128838
+- id = 129526
+- parent_id = 129526
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1949_waadhoeke/graph_values.yml b/datasets/GM1949_waadhoeke/graph_values.yml
index 3460c014a6..f207a6df32 100644
--- a/datasets/GM1949_waadhoeke/graph_values.yml
+++ b/datasets/GM1949_waadhoeke/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3048.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15195868121420342
-    :network_gas: 0.1642272533218812
-    :ambient_heat: 0.6838140654639154
+    :electricity: 0.18371625110939244
+    :network_gas: 0.17327565125067892
+    :ambient_heat: 0.6430080976399286
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 21213.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 841.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.211723239459728
-    :network_gas: 0.1531070421610857
-    :ambient_heat: 0.6351697183791862
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad
index db24f2438b..1c261d8d36 100644
--- a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad
+++ b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1950_westerwolde
-- id = 128839
-- parent_id = 128839
+- id = 129527
+- parent_id = 129527
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1950_westerwolde/graph_values.yml b/datasets/GM1950_westerwolde/graph_values.yml
index 1690dd496f..7563d4ff74 100644
--- a/datasets/GM1950_westerwolde/graph_values.yml
+++ b/datasets/GM1950_westerwolde/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2431.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1474628423651695
-    :network_gas: 0.1889543669915678
-    :ambient_heat: 0.6635827906432626
+    :electricity: 0.1779906941155271
+    :network_gas: 0.19904069570590233
+    :ambient_heat: 0.6229686101785707
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 11770.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 9.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20587163993179203
-    :network_gas: 0.17651344027282984
-    :ambient_heat: 0.6176149197953783
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad
index c6e928f32b..f4ef5ecd6e 100644
--- a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad
+++ b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1952_midden_groningen
-- id = 128840
-- parent_id = 128840
+- id = 129528
+- parent_id = 129528
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1952_midden_groningen/graph_values.yml b/datasets/GM1952_midden_groningen/graph_values.yml
index 8e3667d721..a3af93cba4 100644
--- a/datasets/GM1952_midden_groningen/graph_values.yml
+++ b/datasets/GM1952_midden_groningen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4501.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.148503439178904
-    :network_gas: 0.1832310845160282
-    :ambient_heat: 0.6682654763050679
+    :electricity: 0.17931426058796957
+    :network_gas: 0.19308463779949034
+    :ambient_heat: 0.6276011016125401
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 27986.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 150.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20722812659143236
-    :network_gas: 0.17108749363426823
-    :ambient_heat: 0.6216843797742994
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad
index 70c85e218e..a9917cab63 100644
--- a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad
+++ b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1954_beekdaelen
-- id = 128845
-- parent_id = 128845
+- id = 129533
+- parent_id = 129533
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1954_beekdaelen/graph_values.yml b/datasets/GM1954_beekdaelen/graph_values.yml
index 230b8b5cee..9b0df27b35 100644
--- a/datasets/GM1954_beekdaelen/graph_values.yml
+++ b/datasets/GM1954_beekdaelen/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2560.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1551813967348474
-    :network_gas: 0.14650231795833937
-    :ambient_heat: 0.6983162853068133
+    :electricity: 0.18783195482504997
+    :network_gas: 0.15475495722701235
+    :ambient_heat: 0.6574130879479376
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 16651.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 860.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2159033879423891
-    :network_gas: 0.13638644823044133
-    :ambient_heat: 0.6477101638271696
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1955_montferland/GM1955_montferland.derived.ad b/datasets/GM1955_montferland/GM1955_montferland.derived.ad
index 1f9ef6dc3d..e7e5d4f582 100644
--- a/datasets/GM1955_montferland/GM1955_montferland.derived.ad
+++ b/datasets/GM1955_montferland/GM1955_montferland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1955_montferland
-- id = 128689
-- parent_id = 128689
+- id = 129377
+- parent_id = 129377
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1955_montferland/graph_values.yml b/datasets/GM1955_montferland/graph_values.yml
index a8311bc1c2..11afc74323 100644
--- a/datasets/GM1955_montferland/graph_values.yml
+++ b/datasets/GM1955_montferland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2077.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1565811304925194
-    :network_gas: 0.13880378229114332
-    :ambient_heat: 0.7046150872163373
+    :electricity: 0.18962254441637041
+    :network_gas: 0.14669729218746053
+    :ambient_heat: 0.6636801633961691
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 15970.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 88.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21771523509042046
-    :network_gas: 0.12913905963831593
-    :ambient_heat: 0.6531457052712637
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1959_altena/GM1959_altena.derived.ad b/datasets/GM1959_altena/GM1959_altena.derived.ad
index 4db06e462f..b5d5988e6b 100644
--- a/datasets/GM1959_altena/GM1959_altena.derived.ad
+++ b/datasets/GM1959_altena/GM1959_altena.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1959_altena
-- id = 128844
-- parent_id = 128844
+- id = 129532
+- parent_id = 129532
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1959_altena/graph_values.yml b/datasets/GM1959_altena/graph_values.yml
index 88b988de35..197a9d02c9 100644
--- a/datasets/GM1959_altena/graph_values.yml
+++ b/datasets/GM1959_altena/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3723.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15641663642497247
-    :network_gas: 0.1397084996626515
-    :ambient_heat: 0.7038748639123761
+    :electricity: 0.18941202331302306
+    :network_gas: 0.1476446385491018
+    :ambient_heat: 0.6629433381378753
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22525.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 328.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21750242720115923
-    :network_gas: 0.12999029119536074
-    :ambient_heat: 0.65250728160348
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad
index e9a7420005..02cfbf113c 100644
--- a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad
+++ b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1960_west_betuwe
-- id = 128842
-- parent_id = 128842
+- id = 129530
+- parent_id = 129530
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1960_west_betuwe/graph_values.yml b/datasets/GM1960_west_betuwe/graph_values.yml
index 99a6a0be11..a53dbf21a0 100644
--- a/datasets/GM1960_west_betuwe/graph_values.yml
+++ b/datasets/GM1960_west_betuwe/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4312.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1567454569611169
-    :network_gas: 0.13789998671385695
-    :ambient_heat: 0.7053545563250261
+    :electricity: 0.18983287614192412
+    :network_gas: 0.14575079802714705
+    :ambient_heat: 0.6644163258309288
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20961.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 320.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21792779507211743
-    :network_gas: 0.12828881971152792
-    :ambient_heat: 0.6537833852163546
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad
index 5040d89e79..aa5081b264 100644
--- a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad
+++ b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1961_vijfheerenlanden
-- id = 128841
-- parent_id = 128841
+- id = 129529
+- parent_id = 129529
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1961_vijfheerenlanden/graph_values.yml b/datasets/GM1961_vijfheerenlanden/graph_values.yml
index 96f0843956..f99108ddac 100644
--- a/datasets/GM1961_vijfheerenlanden/graph_values.yml
+++ b/datasets/GM1961_vijfheerenlanden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4871.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15711956116147943
-    :network_gas: 0.13584241361186306
-    :ambient_heat: 0.7070380252266574
+    :electricity: 0.19031180916332865
+    :network_gas: 0.1435955962536282
+    :ambient_heat: 0.666092594583043
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 24175.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 823.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2184115914309691
-    :network_gas: 0.1263536342761213
-    :ambient_heat: 0.6552347742929097
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad
index cfd42908ec..7fdb5b4faa 100644
--- a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad
+++ b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1963_hoeksche_waard
-- id = 128846
-- parent_id = 128846
+- id = 129534
+- parent_id = 129534
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1963_hoeksche_waard/graph_values.yml b/datasets/GM1963_hoeksche_waard/graph_values.yml
index 0f052b91f5..42094fc1cd 100644
--- a/datasets/GM1963_hoeksche_waard/graph_values.yml
+++ b/datasets/GM1963_hoeksche_waard/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5414.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15689623433069352
-    :network_gas: 0.13707071118118552
-    :ambient_heat: 0.7060330544881209
+    :electricity: 0.19002588761666497
+    :network_gas: 0.14488224511039255
+    :ambient_heat: 0.6650918672729426
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 38171.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 523.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21812280166514086
-    :network_gas: 0.12750879333943418
-    :ambient_heat: 0.6543684049954249
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad
index fda43aebfa..125bd6e710 100644
--- a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad
+++ b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1966_het_hogeland
-- id = 128843
-- parent_id = 128843
+- id = 129531
+- parent_id = 129531
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1966_het_hogeland/graph_values.yml b/datasets/GM1966_het_hogeland/graph_values.yml
index 38e4700cbb..3be50d3dc2 100644
--- a/datasets/GM1966_het_hogeland/graph_values.yml
+++ b/datasets/GM1966_het_hogeland/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3049.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.14868886511163196
-    :network_gas: 0.18221124188602425
-    :ambient_heat: 0.6690998930023437
+    :electricity: 0.17955021414171665
+    :network_gas: 0.19202284524233384
+    :ambient_heat: 0.6284269406159495
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22402.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 171.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20746970929435032
-    :network_gas: 0.17012116282259648
-    :ambient_heat: 0.6224091278830531
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad
index 2b2696ac31..c7a7d5b589 100644
--- a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad
+++ b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1969_westerkwartier
-- id = 128849
-- parent_id = 128849
+- id = 129537
+- parent_id = 129537
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1969_westerkwartier/graph_values.yml b/datasets/GM1969_westerkwartier/graph_values.yml
index 8016861e9e..5f42f78876 100644
--- a/datasets/GM1969_westerkwartier/graph_values.yml
+++ b/datasets/GM1969_westerkwartier/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4119.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15243201431775302
-    :network_gas: 0.1616239212523584
-    :ambient_heat: 0.6859440644298886
+    :electricity: 0.18432013825885166
+    :network_gas: 0.17055815507197955
+    :ambient_heat: 0.6451217066691688
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 27257.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 120.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21233794657544836
-    :network_gas: 0.15064821369820425
-    :ambient_heat: 0.6370138397263474
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad
index fe2d76cd8e..9114c8e24e 100644
--- a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad
+++ b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1970_noardeast_fryslan
-- id = 128848
-- parent_id = 128848
+- id = 129536
+- parent_id = 129536
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1970_noardeast_fryslan/graph_values.yml b/datasets/GM1970_noardeast_fryslan/graph_values.yml
index bb86e1584c..9edc216344 100644
--- a/datasets/GM1970_noardeast_fryslan/graph_values.yml
+++ b/datasets/GM1970_noardeast_fryslan/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 4040.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15045225247340382
-    :network_gas: 0.17251261139627888
-    :ambient_heat: 0.6770351361303172
+    :electricity: 0.1817957002327651
+    :network_gas: 0.18191814293626343
+    :ambient_heat: 0.6362861568309714
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 20491.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 571.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20976514712677355
-    :network_gas: 0.16093941149290353
-    :ambient_heat: 0.629295441380323
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad
index 34c36dd198..9b8ea7049a 100644
--- a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad
+++ b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1978_molenlanden
-- id = 128847
-- parent_id = 128847
+- id = 129535
+- parent_id = 129535
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1978_molenlanden/graph_values.yml b/datasets/GM1978_molenlanden/graph_values.yml
index 03f24f920d..ac92e1080b 100644
--- a/datasets/GM1978_molenlanden/graph_values.yml
+++ b/datasets/GM1978_molenlanden/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 2593.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1560025048604546
-    :network_gas: 0.14198622326749952
-    :ambient_heat: 0.7020112718720458
+    :electricity: 0.1888821250769305
+    :network_gas: 0.15002918412681518
+    :ambient_heat: 0.6610886907962542
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 17330.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 281.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2169665224868868
-    :network_gas: 0.13213391005245056
-    :ambient_heat: 0.6508995674606627
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad
index ad057fe8c1..85a3d193c3 100644
--- a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad
+++ b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1979_eemsdelta
-- id = 128850
-- parent_id = 128850
+- id = 129538
+- parent_id = 129538
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1979_eemsdelta/graph_values.yml b/datasets/GM1979_eemsdelta/graph_values.yml
index 6cac773d88..03ceed17cb 100644
--- a/datasets/GM1979_eemsdelta/graph_values.yml
+++ b/datasets/GM1979_eemsdelta/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 3545.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15005346578981135
-    :network_gas: 0.17470593815603752
-    :ambient_heat: 0.6752405960541511
+    :electricity: 0.18128763676368229
+    :network_gas: 0.18420443191758337
+    :ambient_heat: 0.6345079313187343
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 22892.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 350.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.20924635416411283
-    :network_gas: 0.1630145833435465
-    :ambient_heat: 0.6277390624923407
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad
index dc38d858dd..3fb1d8b237 100644
--- a/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad
+++ b/datasets/GM1980_dijk_en_waard/GM1980_dijk_en_waard.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1980_dijk_en_waard
-- id = 128851
-- parent_id = 128851
+- id = 129539
+- parent_id = 129539
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1980_dijk_en_waard/graph_values.yml b/datasets/GM1980_dijk_en_waard/graph_values.yml
index f2bab0e638..b6062aa4ec 100644
--- a/datasets/GM1980_dijk_en_waard/graph_values.yml
+++ b/datasets/GM1980_dijk_en_waard/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6661.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.159919167735872
-    :network_gas: 0.12044457745270397
-    :ambient_heat: 0.719636254811424
+    :electricity: 0.19390003781316914
+    :network_gas: 0.1274485435253604
+    :ambient_heat: 0.6786514186614704
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 36193.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 78.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.22202697664442297
-    :network_gas: 0.11189209342230583
-    :ambient_heat: 0.6660809299332713
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad
index adcdd77ee3..cc1ed06b71 100644
--- a/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad
+++ b/datasets/GM1982_land_van_cuijk/GM1982_land_van_cuijk.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1982_land_van_cuijk
-- id = 128852
-- parent_id = 128852
+- id = 129540
+- parent_id = 129540
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1982_land_van_cuijk/graph_values.yml b/datasets/GM1982_land_van_cuijk/graph_values.yml
index b86c538172..d4aa7ef6b8 100644
--- a/datasets/GM1982_land_van_cuijk/graph_values.yml
+++ b/datasets/GM1982_land_van_cuijk/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 8066.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1558134836882614
-    :network_gas: 0.1430258397145625
-    :ambient_heat: 0.7011606765971763
+    :electricity: 0.18864031774017873
+    :network_gas: 0.15111731874632642
+    :ambient_heat: 0.660242363513495
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 39031.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 325.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21672185503273356
-    :network_gas: 0.1331125798690635
-    :ambient_heat: 0.650165565098203
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad
index 1488393f1f..66696ba27c 100644
--- a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad
+++ b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1991_maashorst
-- id = 128853
-- parent_id = 128853
+- id = 129541
+- parent_id = 129541
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1991_maashorst/graph_values.yml b/datasets/GM1991_maashorst/graph_values.yml
index b5a8bb3ebd..10a656635a 100644
--- a/datasets/GM1991_maashorst/graph_values.yml
+++ b/datasets/GM1991_maashorst/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 6789.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15653460368612232
-    :network_gas: 0.13905967972632716
-    :ambient_heat: 0.7044057165875506
+    :electricity: 0.18956299640707489
+    :network_gas: 0.1469652586243265
+    :ambient_heat: 0.6634717449685986
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 25517.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 55.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2176550459772123
-    :network_gas: 0.12937981609114832
-    :ambient_heat: 0.6529651379316392
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad
index 35c5b1d5f5..9153815d15 100644
--- a/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad
+++ b/datasets/GM1992_voorne_aan_zee/GM1992_voorne_aan_zee.derived.ad
@@ -1,6 +1,6 @@
 - area = GM1992_voorne_aan_zee
-- id = 128854
-- parent_id = 128854
+- id = 129542
+- parent_id = 129542
 - group = municipality
 - enabled.etengine = true
 - enabled.etmodel = true
diff --git a/datasets/GM1992_voorne_aan_zee/graph_values.yml b/datasets/GM1992_voorne_aan_zee/graph_values.yml
index c01dda2eff..871ad9abb4 100644
--- a/datasets/GM1992_voorne_aan_zee/graph_values.yml
+++ b/datasets/GM1992_voorne_aan_zee/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 5708.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.15700378052227112
-    :network_gas: 0.13647920712750863
-    :ambient_heat: 0.7065170123502201
+    :electricity: 0.1901635713875797
+    :network_gas: 0.1442626672278946
+    :ambient_heat: 0.6655737613845257
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 33090.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 570.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.21826187961703514
-    :network_gas: 0.126952481531857
-    :ambient_heat: 0.6547856388511077
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.0366316528640784
+  parent_share: 0.0371676180607669
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.0174442272589
+  parent_share: 0.0176994573116793
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174028867
+  parent_share: 0.0323388136990158
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.097110671286661
+  parent_share: 0.0985315173574029
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.141332525618111
+  parent_share: 0.176496686762675
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.097632076
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.0024774154802166
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.270531400966184
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.531400966183575
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.3922599511574879
+  parent_share: 0.518304995130804
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.500658809437908
+  parent_share: 0.383243045452293
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.0212743750889039
+  parent_share: 0.0381242022457029
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.9983884281198973
+  parent_share: 0.9967795658198888
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.0016115718801027
+  parent_share: 0.0032204341801112
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.4310899160384949
+  parent_share: 0.438476898806052
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240718986006602
+  parent_share: 0.0239827395498924
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.265438604839786
+  parent_share: 0.2816302997565068
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104894965595536
+  parent_share: 0.6943869606936007
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets:
diff --git a/datasets/PV22_drenthe/PV22_drenthe.derived.ad b/datasets/PV22_drenthe/PV22_drenthe.derived.ad
index 2a54160cc6..385d49e6a9 100644
--- a/datasets/PV22_drenthe/PV22_drenthe.derived.ad
+++ b/datasets/PV22_drenthe/PV22_drenthe.derived.ad
@@ -1,6 +1,6 @@
 - area = PV22_drenthe
-- id = 128472
-- parent_id = 128472
+- id = 129200
+- parent_id = 129200
 - group = province
 - enabled.etengine = true
 - enabled.etmodel = true
@@ -141,7 +141,7 @@
 - aquathermal_potential_for_surface_water = 0.0
 - aquathermal_potential_for_waste_water = 0.0
 - aquathermal_potential_for_drink_water = 0.0
-- area_per_building_residence_equivalent = 130.0
+- area_per_building_residence_equivalent = 1560.0
 - electric_vehicle_profile_1_share = 0.24
 - electric_vehicle_profile_2_share = 0.56
 - electric_vehicle_profile_3_share = 0.08
diff --git a/datasets/PV22_drenthe/graph_values.yml b/datasets/PV22_drenthe/graph_values.yml
index ec6b8aaf8e..115b9f49d6 100644
--- a/datasets/PV22_drenthe/graph_values.yml
+++ b/datasets/PV22_drenthe/graph_values.yml
@@ -101,9 +101,9 @@ buildings_solar_pv_solar_radiation:
   full_load_hours: 900.0
 buildings_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.153893106553106
-    :network_gas: 0.153587913957917
-    :ambient_heat: 0.692518979488977
+    :electricity: 0.186185535173166
+    :network_gas: 0.16216385658269
+    :ambient_heat: 0.651650608244144
 buildings_useful_demand_for_space_heating_buildings_present_after_solar_thermal:
   number_of_units: 51337.0
 bunkers_total_useful_demand_planes:
@@ -585,9 +585,9 @@ households_solar_pvt_solar_radiation:
   full_load_hours: 900.0
 households_space_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.1517368409257958
-    :network_gas: 0.16544737490812306
-    :ambient_heat: 0.6828157841660812
+    :electricity: 0.18343328738549816
+    :network_gas: 0.1745489898853592
+    :ambient_heat: 0.6420177227291427
 households_useful_demand_for_hot_water_after_solar_heater:
   number_of_units: 223763.0
 households_useful_demand_for_space_heating_apartments_1945_1964:
@@ -632,9 +632,9 @@ households_useful_demand_for_space_heating_terraced_houses_before_1945:
   number_of_units: 1401.0
 households_water_heater_hybrid_heatpump_air_water_electricity:
   input:
-    :electricity: 0.2114350508081594
-    :network_gas: 0.15425979676736012
-    :ambient_heat: 0.6343051524244805
+    :electricity: 0.0
+    :network_gas: 1.0
+    :ambient_heat: 0.0
 industry_aluminium_electrolysis_current_electricity:
   input:
     :electricity: 0.940352020860495
@@ -989,15 +989,15 @@ households_final_demand_coal-households_final_demand_for_space_heating_coal@coal
 households_final_demand_crude_oil-households_final_demand_for_space_heating_crude_oil@crude_oil:
   parent_share: 0.0
 households_final_demand_electricity-households_final_demand_for_cooking_electricity@electricity:
-  parent_share: 0.03663165
+  parent_share: 0.03716762
 households_final_demand_electricity-households_final_demand_for_cooling_electricity@electricity:
-  parent_share: 0.01744423
+  parent_share: 0.01769946
 households_final_demand_electricity-households_final_demand_for_hot_water_electricity@electricity:
-  parent_share: 0.07891174
+  parent_share: 0.03233881
 households_final_demand_electricity-households_final_demand_for_lighting_electricity@electricity:
-  parent_share: 0.09711067
+  parent_share: 0.09853152
 households_final_demand_electricity-households_final_demand_for_space_heating_electricity@electricity:
-  parent_share: 0.14133253
+  parent_share: 0.17649668
 households_final_demand_for_appliances_electricity-households_appliances_clothes_dryer_electricity@electricity:
   parent_share: 0.09763207
 households_final_demand_for_appliances_electricity-households_appliances_computer_media_electricity@electricity:
@@ -1021,43 +1021,43 @@ households_final_demand_for_cooling_electricity-households_cooling_airconditioni
 households_final_demand_for_cooling_electricity-households_cooling_heatpump_ground_water_electricity@electricity:
   parent_share: 0.00247742
 households_final_demand_for_hot_water_electricity-households_water_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.50065881
+  parent_share: 0.38324305
 households_final_demand_for_hot_water_electricity-households_water_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.02127438
+  parent_share: 0.0381242
 households_final_demand_for_hot_water_electricity-households_water_heater_resistive_electricity@electricity:
-  parent_share: 0.39225995
+  parent_share: 0.51830499
 households_final_demand_for_hot_water_network_gas-households_water_heater_combined_network_gas@network_gas:
-  parent_share: 0.99838843
+  parent_share: 0.99677957
 households_final_demand_for_hot_water_network_gas-households_water_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.00161157
+  parent_share: 0.00322043
 households_final_demand_for_lighting_electricity-households_lighting_efficient_fluorescent_electricity@electricity:
   parent_share: 0.2705314
 households_final_demand_for_lighting_electricity-households_lighting_incandescent_electricity@electricity:
   parent_share: 0.53140097
 households_final_demand_for_space_heating_electricity-households_space_heater_electricity@electricity:
-  parent_share: 0.39225995
+  parent_share: 0.51830499
 households_final_demand_for_space_heating_electricity-households_space_heater_heatpump_air_water_electricity@electricity:
-  parent_share: 0.50065881
+  parent_share: 0.38324305
 households_final_demand_for_space_heating_electricity-households_space_heater_hybrid_heatpump_air_water_electricity@electricity:
-  parent_share: 0.02127438
+  parent_share: 0.0381242
 households_final_demand_for_space_heating_network_gas-households_space_heater_combined_network_gas@network_gas:
-  parent_share: 0.99838843
+  parent_share: 0.99677957
 households_final_demand_for_space_heating_network_gas-households_space_heater_hybrid_heatpump_air_water_electricity@network_gas:
-  parent_share: 0.00161157
+  parent_share: 0.00322043
 households_final_demand_for_space_heating_network_gas-households_space_heater_network_gas@network_gas:
   parent_share: 0.0
 households_final_demand_ht_steam_hot_water-households_final_demand_for_hot_water_ht_steam_hot_water@steam_hot_water:
-  parent_share: 0.43108992
+  parent_share: 0.4384769
 households_final_demand_lt_steam_hot_water-households_final_demand_for_hot_water_lt_steam_hot_water@steam_hot_water:
-  parent_share: 0.43108992
+  parent_share: 0.4384769
 households_final_demand_mt_steam_hot_water-households_final_demand_for_hot_water_mt_steam_hot_water@steam_hot_water:
-  parent_share: 0.43108992
+  parent_share: 0.4384769
 households_final_demand_network_gas-households_final_demand_for_cooking_network_gas@network_gas:
-  parent_share: 0.0240719
+  parent_share: 0.02398274
 households_final_demand_network_gas-households_final_demand_for_hot_water_network_gas@network_gas:
-  parent_share: 0.2654386
+  parent_share: 0.2816303
 households_final_demand_network_gas-households_final_demand_for_space_heating_network_gas@network_gas:
-  parent_share: 0.7104895
+  parent_share: 0.69438696
 households_final_demand_wood_pellets-households_final_demand_for_hot_water_wood_pellets@wood_pellets:
   parent_share: 0.0
 households_final_demand_wood_pellets-households_final_demand_for_space_heating_wood_pellets@wood_pellets: